Commit ff1ae8f3 authored by Solomon Peachy's avatar Solomon Peachy Committed by Greg Kroah-Hartman

Staging: wlan-ng: Eliminate local 'version.h'

The kernel provides us with the proper version of this file.
Signed-off-by: default avatarSolomon Peachy <pizza@shaftnet.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 905862c9
...@@ -114,9 +114,6 @@ ...@@ -114,9 +114,6 @@
/* System Includes */ /* System Includes */
#define WLAN_DBVAR prism2_debug #define WLAN_DBVAR prism2_debug
#include "version.h"
#include <linux/version.h> #include <linux/version.h>
#include <linux/module.h> #include <linux/module.h>
......
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include "version.h"
#include "wlan_compat.h" #include "wlan_compat.h"
/*================================================================*/ /*================================================================*/
......
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include "version.h"
#include "wlan_compat.h" #include "wlan_compat.h"
/*================================================================*/ /*================================================================*/
......
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
/*================================================================*/ /*================================================================*/
/* Project Includes */ /* Project Includes */
#include "version.h"
#include "wlan_compat.h" #include "wlan_compat.h"
#include "p80211types.h" #include "p80211types.h"
#include "p80211hdr.h" #include "p80211hdr.h"
...@@ -1102,8 +1101,8 @@ p80211netdev_proc_read( ...@@ -1102,8 +1101,8 @@ p80211netdev_proc_read(
goto exit; goto exit;
} }
p += sprintf(p, "p80211 version: %s (%s)\n\n", p += sprintf(p, "p80211 version: %s\n\n",
WLAN_RELEASE, WLAN_BUILD_DATE); WLAN_RELEASE);
p += sprintf(p, "name : %s\n", wlandev->name); p += sprintf(p, "name : %s\n", wlandev->name);
p += sprintf(p, "nsd name : %s\n", wlandev->nsdname); p += sprintf(p, "nsd name : %s\n", wlandev->nsdname);
p += sprintf(p, "address : %02x:%02x:%02x:%02x:%02x:%02x\n", p += sprintf(p, "address : %02x:%02x:%02x:%02x:%02x:%02x\n",
......
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
#include <net/sock.h> #include <net/sock.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include "version.h"
#include "wlan_compat.h" #include "wlan_compat.h"
/*================================================================*/ /*================================================================*/
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/random.h> #include <linux/random.h>
#include "version.h"
#include "wlan_compat.h" #include "wlan_compat.h"
// #define WEP_DEBUG // #define WEP_DEBUG
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
/*================================================================*/ /*================================================================*/
/* Project Includes */ /* Project Includes */
#include "version.h"
#include "wlan_compat.h" #include "wlan_compat.h"
#include "p80211types.h" #include "p80211types.h"
......
...@@ -61,9 +61,6 @@ ...@@ -61,9 +61,6 @@
/* System Includes */ /* System Includes */
#define WLAN_DBVAR prism2_debug #define WLAN_DBVAR prism2_debug
#include "version.h"
#include <linux/version.h> #include <linux/version.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
......
...@@ -54,9 +54,6 @@ ...@@ -54,9 +54,6 @@
/* System Includes */ /* System Includes */
#define WLAN_DBVAR prism2_debug #define WLAN_DBVAR prism2_debug
#include "version.h"
#include <linux/version.h> #include <linux/version.h>
#include <linux/module.h> #include <linux/module.h>
......
...@@ -54,8 +54,6 @@ ...@@ -54,8 +54,6 @@
/* System Includes */ /* System Includes */
#define WLAN_DBVAR prism2_debug #define WLAN_DBVAR prism2_debug
#include "version.h"
#include <linux/version.h> #include <linux/version.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
...@@ -2221,9 +2219,9 @@ prism2sta_proc_read( ...@@ -2221,9 +2219,9 @@ prism2sta_proc_read(
// XXX 0x0001 for prism2.5/3, 0x0000 for prism2. // XXX 0x0001 for prism2.5/3, 0x0000 for prism2.
hwtype = BIT0; hwtype = BIT0;
p += sprintf(p, "# %s version %s (%s)\n\n", p += sprintf(p, "# %s version %s\n\n",
dev_info, dev_info,
WLAN_RELEASE, WLAN_BUILD_DATE); WLAN_RELEASE);
p += sprintf(p, "# nic h/w: id=0x%02x %d.%d.%d\n", p += sprintf(p, "# nic h/w: id=0x%02x %d.%d.%d\n",
hw->ident_nic.id, hw->ident_nic.major, hw->ident_nic.id, hw->ident_nic.major,
......
/* src/include/wlan/version.h
*
*
* Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved.
* --------------------------------------------------------------------
*
* linux-wlan
*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU Public License version 2 (the "GPL"), in which
* case the provisions of the GPL are applicable instead of the
* above. If you wish to allow the use of your version of this file
* only under the terms of the GPL and not to allow others to use
* your version of this file under the MPL, indicate your decision
* by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL. If you do not delete
* the provisions above, a recipient may use your version of this
* file under either the MPL or the GPL.
*
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
* made directly to:
*
* AbsoluteValue Systems Inc.
* info@linux-wlan.com
* http://www.linux-wlan.com
*
* --------------------------------------------------------------------
*
* Portions of the development of this software were funded by
* Intersil Corporation as part of PRISM(R) chipset product development.
*
* --------------------------------------------------------------------
*/
#ifndef _WLAN_VERSION_H
#define _WLAN_VERSION_H
#ifndef KERNEL_VERSION
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
#endif
#define WLAN_RELEASE "0.2.8"
#define WLAN_RELEASE_CODE 0x000208
#define WLAN_BUILD_DATE "Thu Oct 2 11:04:42 PDT 2008"
#endif
...@@ -134,6 +134,8 @@ typedef int64_t INT64; ...@@ -134,6 +134,8 @@ typedef int64_t INT64;
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
#endif #endif
#define WLAN_RELEASE "0.3.0-lkml"
#include <linux/hardirq.h> #include <linux/hardirq.h>
#define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args); #define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment