Commit c12edfe2 authored by Kalle Valo's avatar Kalle Valo

prism54: move under intersil vendor directory

Part of reorganising wireless drivers directory and Kconfig.
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2be45b66
...@@ -8498,7 +8498,7 @@ M: "Luis R. Rodriguez" <mcgrof@gmail.com> ...@@ -8498,7 +8498,7 @@ M: "Luis R. Rodriguez" <mcgrof@gmail.com>
L: linux-wireless@vger.kernel.org L: linux-wireless@vger.kernel.org
W: http://wireless.kernel.org/en/users/Drivers/p54 W: http://wireless.kernel.org/en/users/Drivers/p54
S: Obsolete S: Obsolete
F: drivers/net/wireless/prism54/ F: drivers/net/wireless/intersil/prism54/
PS3 NETWORK SUPPORT PS3 NETWORK SUPPORT
M: Geoff Levand <geoff@infradead.org> M: Geoff Levand <geoff@infradead.org>
......
...@@ -52,26 +52,6 @@ config PCMCIA_WL3501 ...@@ -52,26 +52,6 @@ config PCMCIA_WL3501
It has basic support for Linux wireless extensions and initial It has basic support for Linux wireless extensions and initial
micro support for ethtool. micro support for ethtool.
config PRISM54
tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'
depends on PCI
select WIRELESS_EXT
select WEXT_SPY
select WEXT_PRIV
select FW_LOADER
---help---
This enables support for FullMAC PCI/Cardbus prism54 devices. This
driver is now deprecated in favor for the SoftMAC driver, p54pci.
p54pci supports FullMAC PCI/Cardbus devices as well.
For more information refer to the p54 wiki:
http://wireless.kernel.org/en/users/Drivers/p54
Note: You need a motherboard with DMA support to use any of these cards
When built as module you get the module prism54
config USB_NET_RNDIS_WLAN config USB_NET_RNDIS_WLAN
tristate "Wireless RNDIS USB support" tristate "Wireless RNDIS USB support"
depends on USB depends on USB
......
...@@ -12,8 +12,6 @@ obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/ ...@@ -12,8 +12,6 @@ obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
obj-$(CONFIG_WLAN_VENDOR_ST) += st/ obj-$(CONFIG_WLAN_VENDOR_ST) += st/
obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/ obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
obj-$(CONFIG_PRISM54) += prism54/
obj-$(CONFIG_WLAN) += realtek/ obj-$(CONFIG_WLAN) += realtek/
# 16-bit wireless PCMCIA client drivers # 16-bit wireless PCMCIA client drivers
......
...@@ -15,4 +15,24 @@ source "drivers/net/wireless/intersil/hostap/Kconfig" ...@@ -15,4 +15,24 @@ source "drivers/net/wireless/intersil/hostap/Kconfig"
source "drivers/net/wireless/intersil/orinoco/Kconfig" source "drivers/net/wireless/intersil/orinoco/Kconfig"
source "drivers/net/wireless/intersil/p54/Kconfig" source "drivers/net/wireless/intersil/p54/Kconfig"
config PRISM54
tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'
depends on PCI
select WIRELESS_EXT
select WEXT_SPY
select WEXT_PRIV
select FW_LOADER
---help---
This enables support for FullMAC PCI/Cardbus prism54 devices. This
driver is now deprecated in favor for the SoftMAC driver, p54pci.
p54pci supports FullMAC PCI/Cardbus devices as well.
For more information refer to the p54 wiki:
http://wireless.kernel.org/en/users/Drivers/p54
Note: You need a motherboard with DMA support to use any of these cards
When built as module you get the module prism54
endif # WLAN_VENDOR_INTERSIL endif # WLAN_VENDOR_INTERSIL
obj-$(CONFIG_HOSTAP) += hostap/ obj-$(CONFIG_HOSTAP) += hostap/
obj-$(CONFIG_HERMES) += orinoco/ obj-$(CONFIG_HERMES) += orinoco/
obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_P54_COMMON) += p54/
obj-$(CONFIG_PRISM54) += prism54/
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