Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

prism54: move under intersil vendor directory

Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

+22 -23
+1 -1
MAINTAINERS
··· 8498 8498 L: linux-wireless@vger.kernel.org 8499 8499 W: http://wireless.kernel.org/en/users/Drivers/p54 8500 8500 S: Obsolete 8501 - F: drivers/net/wireless/prism54/ 8501 + F: drivers/net/wireless/intersil/prism54/ 8502 8502 8503 8503 PS3 NETWORK SUPPORT 8504 8504 M: Geoff Levand <geoff@infradead.org>
-20
drivers/net/wireless/Kconfig
··· 52 52 It has basic support for Linux wireless extensions and initial 53 53 micro support for ethtool. 54 54 55 - config PRISM54 56 - tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)' 57 - depends on PCI 58 - select WIRELESS_EXT 59 - select WEXT_SPY 60 - select WEXT_PRIV 61 - select FW_LOADER 62 - ---help--- 63 - This enables support for FullMAC PCI/Cardbus prism54 devices. This 64 - driver is now deprecated in favor for the SoftMAC driver, p54pci. 65 - p54pci supports FullMAC PCI/Cardbus devices as well. 66 - 67 - For more information refer to the p54 wiki: 68 - 69 - http://wireless.kernel.org/en/users/Drivers/p54 70 - 71 - Note: You need a motherboard with DMA support to use any of these cards 72 - 73 - When built as module you get the module prism54 74 - 75 55 config USB_NET_RNDIS_WLAN 76 56 tristate "Wireless RNDIS USB support" 77 57 depends on USB
-2
drivers/net/wireless/Makefile
··· 12 12 obj-$(CONFIG_WLAN_VENDOR_ST) += st/ 13 13 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/ 14 14 15 - obj-$(CONFIG_PRISM54) += prism54/ 16 - 17 15 obj-$(CONFIG_WLAN) += realtek/ 18 16 19 17 # 16-bit wireless PCMCIA client drivers
+20
drivers/net/wireless/intersil/Kconfig
··· 15 15 source "drivers/net/wireless/intersil/orinoco/Kconfig" 16 16 source "drivers/net/wireless/intersil/p54/Kconfig" 17 17 18 + config PRISM54 19 + tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)' 20 + depends on PCI 21 + select WIRELESS_EXT 22 + select WEXT_SPY 23 + select WEXT_PRIV 24 + select FW_LOADER 25 + ---help--- 26 + This enables support for FullMAC PCI/Cardbus prism54 devices. This 27 + driver is now deprecated in favor for the SoftMAC driver, p54pci. 28 + p54pci supports FullMAC PCI/Cardbus devices as well. 29 + 30 + For more information refer to the p54 wiki: 31 + 32 + http://wireless.kernel.org/en/users/Drivers/p54 33 + 34 + Note: You need a motherboard with DMA support to use any of these cards 35 + 36 + When built as module you get the module prism54 37 + 18 38 endif # WLAN_VENDOR_INTERSIL
+1
drivers/net/wireless/intersil/Makefile
··· 1 1 obj-$(CONFIG_HOSTAP) += hostap/ 2 2 obj-$(CONFIG_HERMES) += orinoco/ 3 3 obj-$(CONFIG_P54_COMMON) += p54/ 4 + obj-$(CONFIG_PRISM54) += prism54/
drivers/net/wireless/prism54/Makefile drivers/net/wireless/intersil/prism54/Makefile
drivers/net/wireless/prism54/isl_38xx.c drivers/net/wireless/intersil/prism54/isl_38xx.c
drivers/net/wireless/prism54/isl_38xx.h drivers/net/wireless/intersil/prism54/isl_38xx.h
drivers/net/wireless/prism54/isl_ioctl.c drivers/net/wireless/intersil/prism54/isl_ioctl.c
drivers/net/wireless/prism54/isl_ioctl.h drivers/net/wireless/intersil/prism54/isl_ioctl.h
drivers/net/wireless/prism54/isl_oid.h drivers/net/wireless/intersil/prism54/isl_oid.h
drivers/net/wireless/prism54/islpci_dev.c drivers/net/wireless/intersil/prism54/islpci_dev.c
drivers/net/wireless/prism54/islpci_dev.h drivers/net/wireless/intersil/prism54/islpci_dev.h
drivers/net/wireless/prism54/islpci_eth.c drivers/net/wireless/intersil/prism54/islpci_eth.c
drivers/net/wireless/prism54/islpci_eth.h drivers/net/wireless/intersil/prism54/islpci_eth.h
drivers/net/wireless/prism54/islpci_hotplug.c drivers/net/wireless/intersil/prism54/islpci_hotplug.c
drivers/net/wireless/prism54/islpci_mgt.c drivers/net/wireless/intersil/prism54/islpci_mgt.c
drivers/net/wireless/prism54/islpci_mgt.h drivers/net/wireless/intersil/prism54/islpci_mgt.h
drivers/net/wireless/prism54/oid_mgt.c drivers/net/wireless/intersil/prism54/oid_mgt.c
drivers/net/wireless/prism54/oid_mgt.h drivers/net/wireless/intersil/prism54/oid_mgt.h
drivers/net/wireless/prism54/prismcompat.h drivers/net/wireless/intersil/prism54/prismcompat.h