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

The kernel provides us with the proper version of this file.

Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 06700683f0a0a924fd0eb9835ad85baec2f0bd05..53c547d36ed9b1a9e0a9d485c621828d7b61adc6 100644 (file)
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -114,9 +114,6 @@
 /* System Includes */
 #define WLAN_DBVAR     prism2_debug
 
-#include "version.h"
-
-
 #include <linux/version.h>
 
 #include <linux/module.h>

diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index aaf1c9d444878ab74b311465565b2dcdb95135fb..749ea8d93207c1d50c1c05e5092cca9419621fa9 100644 (file)
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -70,7 +70,6 @@
 
 #include <asm/byteorder.h>
 
-#include "version.h"
 #include "wlan_compat.h"
 
 /*================================================================*/

diff --git a/drivers/staging/wlan-ng/p80211mod.c b/drivers/staging/wlan-ng/p80211mod.c
index 7a3834e16da021318662fabe22b5be91ff2f730b..29cae879ff4454ea6b2ac2c330246e6e8a393a8a 100644 (file)
--- a/drivers/staging/wlan-ng/p80211mod.c
+++ b/drivers/staging/wlan-ng/p80211mod.c
@@ -68,7 +68,6 @@
 #include <linux/wireless.h>
 #include <linux/netdevice.h>
 
-#include "version.h"
 #include "wlan_compat.h"
 
 /*================================================================*/

diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index 7b38883bf008443af1fd742f3c1ad92f669afdb8..fa8bc767d9b9da83b4725231e138548faf2d5e96 100644 (file)
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -85,7 +85,6 @@
 /*================================================================*/
 /* Project Includes */
 
-#include "version.h"
 #include "wlan_compat.h"
 #include "p80211types.h"
 #include "p80211hdr.h"
@@ -1102,8 +1101,8 @@ p80211netdev_proc_read(
                goto exit;
        }
 
-       p += sprintf(p, "p80211 version: %s (%s)\n\n",
-                    WLAN_RELEASE, WLAN_BUILD_DATE);
+       p += sprintf(p, "p80211 version: %s\n\n",
+                    WLAN_RELEASE);
        p += sprintf(p, "name       : %s\n", wlandev->name);
        p += sprintf(p, "nsd name   : %s\n", wlandev->nsdname);
        p += sprintf(p, "address    : %02x:%02x:%02x:%02x:%02x:%02x\n",

diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index 0233abeccc4b76ebf7d14908e2d0ed71e65a77bc..83bd65b62488be8943e81d92c9362c5c73ac5328 100644 (file)
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -68,7 +68,6 @@
 #include <net/sock.h>
 #include <linux/netlink.h>
 
-#include "version.h"
 #include "wlan_compat.h"
 
 /*================================================================*/

diff --git a/drivers/staging/wlan-ng/p80211wep.c b/drivers/staging/wlan-ng/p80211wep.c
index 11a50c7fbfc8c470e11dd35eeebfb5bacdd855f2..0ab0d077af9289e3ed003a5033b8d0d0882552d6 100644 (file)
--- a/drivers/staging/wlan-ng/p80211wep.c
+++ b/drivers/staging/wlan-ng/p80211wep.c
@@ -56,7 +56,6 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 
-#include "version.h"
 #include "wlan_compat.h"
 
 // #define WEP_DEBUG

diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 84b6d3208034caeedb6337cb296417c8f7d57a87..4a690199973fc0f2a75366ec68f29cca78c8dbcc 100644 (file)
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -56,7 +56,6 @@
 /*================================================================*/
 /* Project Includes */
 
-#include "version.h"
 #include "wlan_compat.h"
 
 #include "p80211types.h"

diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index de2ec1e7c9de1d1d5486fd2113eee0c09915ad7c..c2f61ede0c61d802fc3398b1926a03e091b886d0 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -61,9 +61,6 @@
 /* System Includes */
 #define WLAN_DBVAR     prism2_debug
 
-#include "version.h"
-
-
 #include <linux/version.h>
 
 #include <linux/if_arp.h>

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 5785ff97604d757759593f1f6982a944959f0bbc..5a8dffc5e1b889b670a1be85e6c5190eab240922 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -54,9 +54,6 @@
 /* System Includes */
 #define WLAN_DBVAR     prism2_debug
 
-#include "version.h"
-
-
 #include <linux/version.h>
 
 #include <linux/module.h>

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 8ce1ee970b88030874fd385709f1ebb0fd204c48..05c048071e91fa55ed025655d670ecc56c3e88d9 100644 (file)
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -54,8 +54,6 @@
 /* System Includes */
 #define WLAN_DBVAR     prism2_debug
 
-#include "version.h"
-
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -2221,9 +2219,9 @@ prism2sta_proc_read(
        // XXX 0x0001 for prism2.5/3, 0x0000 for prism2.
        hwtype = BIT0;
 
-       p += sprintf(p, "# %s version %s (%s)\n\n",
+       p += sprintf(p, "# %s version %s\n\n",
                     dev_info,
-                    WLAN_RELEASE, WLAN_BUILD_DATE);
+                    WLAN_RELEASE);
 
        p += sprintf(p, "# nic h/w: id=0x%02x %d.%d.%d\n",
                     hw->ident_nic.id, hw->ident_nic.major,

diff --git a/drivers/staging/wlan-ng/version.h b/drivers/staging/wlan-ng/version.h
deleted file mode 100644 (file)
index 86190a1..0000000
--- a/drivers/staging/wlan-ng/version.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* 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

diff --git a/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h
index 3127754f9fe8e1694fb476a069e0b87d35868bc3..0ecc3fa49883e20c370c87022104a200fc8084cc 100644 (file)
--- a/drivers/staging/wlan-ng/wlan_compat.h
+++ b/drivers/staging/wlan-ng/wlan_compat.h
@@ -134,6 +134,8 @@ typedef int64_t             INT64;
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 #endif
 
+#define WLAN_RELEASE   "0.3.0-lkml"
+
 #include <linux/hardirq.h>
 
 #define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args);