diff options
| -rw-r--r-- | drivers/net/wireless/Kconfig | 65 | ||||
| -rw-r--r-- | drivers/net/wireless/Makefile | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/p54/Kconfig | 63 | ||||
| -rw-r--r-- | drivers/net/wireless/p54/Makefile | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/p54/net2280.h (renamed from drivers/net/wireless/net2280.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/p54/p54.h (renamed from drivers/net/wireless/p54.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/p54/p54common.c (renamed from drivers/net/wireless/p54common.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/p54/p54common.h (renamed from drivers/net/wireless/p54common.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/p54/p54pci.c (renamed from drivers/net/wireless/p54pci.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/p54/p54pci.h (renamed from drivers/net/wireless/p54pci.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/p54/p54usb.c (renamed from drivers/net/wireless/p54usb.c) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/p54/p54usb.h (renamed from drivers/net/wireless/p54usb.h) | 0 |
12 files changed, 68 insertions, 67 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 3c8cf682e9bd..fdf5aa8b8429 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -673,70 +673,7 @@ config ADM8211 Thanks to Infineon-ADMtek for their support of this driver. -config P54_COMMON - tristate "Softmac Prism54 support" - depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL - ---help--- - This is common code for isl38xx based cards. - This module does nothing by itself - the USB/PCI frontends - also need to be enabled in order to support any devices. - - These devices require softmac firmware which can be found at - http://prism54.org/ - - If you choose to build a module, it'll be called p54common. - -config P54_USB - tristate "Prism54 USB support" - depends on P54_COMMON && USB - select CRC32 - ---help--- - This driver is for USB isl38xx based wireless cards. - These are USB based adapters found in devices such as: - - 3COM 3CRWE254G72 - SMC 2862W-G - Accton 802.11g WN4501 USB - Siemens Gigaset USB - Netgear WG121 - Netgear WG111 - Medion 40900, Roper Europe - Shuttle PN15, Airvast WM168g, IOGear GWU513 - Linksys WUSB54G - Linksys WUSB54G Portable - DLink DWL-G120 Spinnaker - DLink DWL-G122 - Belkin F5D7050 ver 1000 - Cohiba Proto board - SMC 2862W-G version 2 - U.S. Robotics U5 802.11g Adapter - FUJITSU E-5400 USB D1700 - Sagem XG703A - DLink DWL-G120 Cohiba - Spinnaker Proto board - Linksys WUSB54AG - Inventel UR054G - Spinnaker DUT - - These devices require softmac firmware which can be found at - http://prism54.org/ - - If you choose to build a module, it'll be called p54usb. - -config P54_PCI - tristate "Prism54 PCI support" - depends on P54_COMMON && PCI - ---help--- - This driver is for PCI isl38xx based wireless cards. - This driver supports most devices that are supported by the - fullmac prism54 driver plus many devices which are not - supported by the fullmac driver/firmware. - - This driver requires softmac firmware which can be found at - http://prism54.org/ - - If you choose to build a module, it'll be called p54pci. - +source "drivers/net/wireless/p54/Kconfig" source "drivers/net/wireless/ath5k/Kconfig" source "drivers/net/wireless/iwlwifi/Kconfig" source "drivers/net/wireless/hostap/Kconfig" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index dd3899747b5c..70092191fc53 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -60,8 +60,6 @@ obj-$(CONFIG_IWL3945) += iwlwifi/ obj-$(CONFIG_IWL4965) += iwlwifi/ obj-$(CONFIG_RT2X00) += rt2x00/ -obj-$(CONFIG_P54_COMMON) += p54common.o -obj-$(CONFIG_P54_USB) += p54usb.o -obj-$(CONFIG_P54_PCI) += p54pci.o +obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_ATH5K) += ath5k/ diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig new file mode 100644 index 000000000000..d3469d08f966 --- /dev/null +++ b/drivers/net/wireless/p54/Kconfig @@ -0,0 +1,63 @@ +config P54_COMMON + tristate "Softmac Prism54 support" + depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL + ---help--- + This is common code for isl38xx based cards. + This module does nothing by itself - the USB/PCI frontends + also need to be enabled in order to support any devices. + + These devices require softmac firmware which can be found at + http://prism54.org/ + + If you choose to build a module, it'll be called p54common. + +config P54_USB + tristate "Prism54 USB support" + depends on P54_COMMON && USB + select CRC32 + ---help--- + This driver is for USB isl38xx based wireless cards. + These are USB based adapters found in devices such as: + + 3COM 3CRWE254G72 + SMC 2862W-G + Accton 802.11g WN4501 USB + Siemens Gigaset USB + Netgear WG121 + Netgear WG111 + Medion 40900, Roper Europe + Shuttle PN15, Airvast WM168g, IOGear GWU513 + Linksys WUSB54G + Linksys WUSB54G Portable + DLink DWL-G120 Spinnaker + DLink DWL-G122 + Belkin F5D7050 ver 1000 + Cohiba Proto board + SMC 2862W-G version 2 + U.S. Robotics U5 802.11g Adapter + FUJITSU E-5400 USB D1700 + Sagem XG703A + DLink DWL-G120 Cohiba + Spinnaker Proto board + Linksys WUSB54AG + Inventel UR054G + Spinnaker DUT + + These devices require softmac firmware which can be found at + http://prism54.org/ + + If you choose to build a module, it'll be called p54usb. + +config P54_PCI + tristate "Prism54 PCI support" + depends on P54_COMMON && PCI + ---help--- + This driver is for PCI isl38xx based wireless cards. + This driver supports most devices that are supported by the + fullmac prism54 driver plus many devices which are not + supported by the fullmac driver/firmware. + + This driver requires softmac firmware which can be found at + http://prism54.org/ + + If you choose to build a module, it'll be called p54pci. diff --git a/drivers/net/wireless/p54/Makefile b/drivers/net/wireless/p54/Makefile new file mode 100644 index 000000000000..4fa9ce717360 --- /dev/null +++ b/drivers/net/wireless/p54/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_P54_COMMON) += p54common.o +obj-$(CONFIG_P54_USB) += p54usb.o +obj-$(CONFIG_P54_PCI) += p54pci.o diff --git a/drivers/net/wireless/net2280.h b/drivers/net/wireless/p54/net2280.h index 120eb831b287..120eb831b287 100644 --- a/drivers/net/wireless/net2280.h +++ b/drivers/net/wireless/p54/net2280.h diff --git a/drivers/net/wireless/p54.h b/drivers/net/wireless/p54/p54.h index 06d2c67f4c81..06d2c67f4c81 100644 --- a/drivers/net/wireless/p54.h +++ b/drivers/net/wireless/p54/p54.h diff --git a/drivers/net/wireless/p54common.c b/drivers/net/wireless/p54/p54common.c index 63f9badf3f52..63f9badf3f52 100644 --- a/drivers/net/wireless/p54common.c +++ b/drivers/net/wireless/p54/p54common.c diff --git a/drivers/net/wireless/p54common.h b/drivers/net/wireless/p54/p54common.h index c15b56e1d75e..c15b56e1d75e 100644 --- a/drivers/net/wireless/p54common.h +++ b/drivers/net/wireless/p54/p54common.h diff --git a/drivers/net/wireless/p54pci.c b/drivers/net/wireless/p54/p54pci.c index fa527723fbe0..fa527723fbe0 100644 --- a/drivers/net/wireless/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c diff --git a/drivers/net/wireless/p54pci.h b/drivers/net/wireless/p54/p54pci.h index 5bedd7af385d..5bedd7af385d 100644 --- a/drivers/net/wireless/p54pci.h +++ b/drivers/net/wireless/p54/p54pci.h diff --git a/drivers/net/wireless/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 98ddbb3b3273..98ddbb3b3273 100644 --- a/drivers/net/wireless/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c diff --git a/drivers/net/wireless/p54usb.h b/drivers/net/wireless/p54/p54usb.h index d1896b396c1c..d1896b396c1c 100644 --- a/drivers/net/wireless/p54usb.h +++ b/drivers/net/wireless/p54/p54usb.h |