MAybe this will fix the modversion madness.

This commit is contained in:
solomon 2002-08-12 13:52:05 +00:00
parent 402b246704
commit 096dd1f860
16 changed files with 79 additions and 6 deletions

View file

@ -41,6 +41,8 @@
* Intersil Corporation as part of PRISM(R) chipset product development.
*
* --------------------------------------------------------------------
- Include an almost-sane fix to the modversion madness
- tweak the init order of the PCI driver structs.
-pre3
- Added ident info for ASUS WL-110/WL-100 cards
- Support for PCI power managment

View file

@ -1,7 +1,7 @@
WLAN_VERSION=0
WLAN_PATCHLEVEL=1
WLAN_SUBLEVEL=15
WLAN_EXTRAVERSION=-pre3
WLAN_EXTRAVERSION=-pre4
LINUX_SRC=/usr/src/linux
WLAN_TARGET_ARCH=
PCMCIA_SRC=

View file

@ -0,0 +1,62 @@
/* src/include/wlan/modver_wrapper.h
*
* Wrapper for the CONFIG_MODVER stuff
*
* Copyright (C) 2002 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
*
* --------------------------------------------------------------------
* This file defines a symbol and includes a header file that are
* handled as command-line arguments in the kernel's "make modules".
*
* We _could_ do these via command-line arguments but it would require
* even more shell ugliness in our "make config".
*
* This file should be included AFTER linux/config.h and before the
* rest of the kernel includes.
*
* --------------------------------------------------------------------
*/
#ifndef _MODVER_WRAPPER_H
#define _MODVER_WRAPPER_H
#ifdef CONFIG_MODVERSIONS
#define MODVERSIONS 1
#include <linux/modversions.h>
#endif
#endif

View file

@ -58,6 +58,7 @@
#include <linux/config.h>
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/module.h>
#include <linux/kernel.h>

View file

@ -59,6 +59,7 @@
#include <linux/config.h>
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/module.h>
#include <linux/kernel.h>

View file

@ -58,6 +58,7 @@
#include <linux/config.h>
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/module.h>
#include <linux/kernel.h>

View file

@ -57,6 +57,7 @@
#include <linux/config.h>
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/module.h>
#include <linux/kernel.h>

View file

@ -57,6 +57,7 @@
#include <linux/config.h>
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/module.h>
#include <linux/kernel.h>

View file

@ -50,6 +50,7 @@
#include <linux/config.h>
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,0))
#include <linux/malloc.h>

View file

@ -37,12 +37,12 @@
#include <linux/config.h>
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/types.h>
#include <linux/skbuff.h>
#include <linux/slab.h>
#include <linux/netdevice.h>
#include <linux/rtnetlink.h>

View file

@ -121,6 +121,7 @@
#include <linux/config.h>
#define WLAN_DBVAR prism2_debug
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/module.h>
#include <linux/kernel.h>

View file

@ -117,6 +117,7 @@
#include <linux/config.h>
#define WLAN_DBVAR prism2_debug
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/module.h>
#include <linux/kernel.h>

View file

@ -65,6 +65,7 @@
#include <linux/config.h>
#define WLAN_DBVAR prism2_debug
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/if_arp.h>
#include <linux/module.h>

View file

@ -58,6 +58,7 @@
#include <linux/config.h>
#define WLAN_DBVAR prism2_debug
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/module.h>
#include <linux/kernel.h>

View file

@ -56,6 +56,7 @@
#include <linux/config.h>
#define WLAN_DBVAR prism2_debug
#include <linux/version.h>
#include <wlan/modver_wrapper.h>
#include <linux/module.h>
#include <linux/kernel.h>
@ -353,9 +354,9 @@ static void prism2sta_remove_plx(struct pci_dev *pdev);
struct pci_driver prism2_plx_drv_id = {
name: "prism2_plx",
id_table: plx_id_tbl,
probe: prism2sta_probe_plx,
remove: prism2sta_remove_plx,
id_table: plx_id_tbl,
#ifdef CONFIG_PM
suspend: prism2sta_suspend_pci,
resume: prism2sta_resume_pci,
@ -386,9 +387,9 @@ static void prism2sta_remove_pci(struct pci_dev *pdev);
struct pci_driver prism2_pci_drv_id = {
name: "prism2_pci",
id_table: pci_id_tbl,
probe: prism2sta_probe_pci,
remove: prism2sta_remove_pci,
id_table: pci_id_tbl,
#ifdef CONFIG_PM
suspend: prism2sta_suspend_pci,
resume: prism2sta_resume_pci,

View file

@ -39,7 +39,6 @@
#include <prism2/prism2wext.h>
/* compatibility to wireless extensions */
#if defined(__LINUX_WLAN__) && defined (__KERNEL__)
#if WIRELESS_EXT > 10
/* taken from orinoco.c ;-) */
@ -410,5 +409,4 @@ int prism2wext_get_string(hfa384x_t *hw, struct iw_point *erq, UINT16 rid, UINT1
return (err);
}
#endif
#endif /* compatibility to wireless extensions */