prism54 is deprecated in favor of the p54pci device driver. Although
only *one soul* had reported issues with it long ago Linux most Linux
distributions these days just disable the device driver given the
conflicts with the PCI IDs of p54pci and the *very* unlikely situation
of folks really need this driver anymore.
Before trying to due away with prism54 once more stuff it into staging,
which is our hospice for dying drivers.
Acked-by: Kalle Valo
Signed-off-by: Luis R. Rodriguez
---
MAINTAINERS | 4 ++--
drivers/net/wireless/intersil/Kconfig| 20
drivers/net/wireless/intersil/Makefile | 1 -
drivers/staging/Kconfig | 2 ++
drivers/staging/Makefile | 1 +
.../wireless/intersil => staging}/prism54/Makefile | 0
drivers/staging/prism54/TODO | 5 +
.../wireless/intersil => staging}/prism54/isl_38xx.c | 0
.../wireless/intersil => staging}/prism54/isl_38xx.h | 0
.../intersil => staging}/prism54/isl_ioctl.c | 0
.../intersil => staging}/prism54/isl_ioctl.h | 0
.../wireless/intersil => staging}/prism54/isl_oid.h | 0
.../intersil => staging}/prism54/islpci_dev.c| 0
.../intersil => staging}/prism54/islpci_dev.h| 0
.../intersil => staging}/prism54/islpci_eth.c| 0
.../intersil => staging}/prism54/islpci_eth.h| 0
.../intersil => staging}/prism54/islpci_hotplug.c| 0
.../intersil => staging}/prism54/islpci_mgt.c| 0
.../intersil => staging}/prism54/islpci_mgt.h| 0
.../wireless/intersil => staging}/prism54/oid_mgt.c | 0
.../wireless/intersil => staging}/prism54/oid_mgt.h | 0
.../intersil => staging}/prism54/prismcompat.h | 0
22 files changed, 10 insertions(+), 23 deletions(-)
rename drivers/{net/wireless/intersil => staging}/prism54/Makefile (100%)
create mode 100644 drivers/staging/prism54/TODO
rename drivers/{net/wireless/intersil => staging}/prism54/isl_38xx.c (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/isl_38xx.h (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/isl_ioctl.c (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/isl_ioctl.h (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/isl_oid.h (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/islpci_dev.c (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/islpci_dev.h (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/islpci_eth.c (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/islpci_eth.h (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/islpci_hotplug.c
(100%)
rename drivers/{net/wireless/intersil => staging}/prism54/islpci_mgt.c (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/islpci_mgt.h (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/oid_mgt.c (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/oid_mgt.h (100%)
rename drivers/{net/wireless/intersil => staging}/prism54/prismcompat.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 672b5d5402f0..3deaddc8c578 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10674,11 +10674,11 @@ F:kernel/printk/
F: include/linux/printk.h
PRISM54 WIRELESS DRIVER
-M: "Luis R. Rodriguez"
+M: "Luis R. Rodriguez"
L: linux-wireless@vger.kernel.org
W: http://wireless.kernel.org/en/users/Drivers/p54
S: Obsolete
-F: drivers/net/wireless/intersil/prism54/
+F: drivers/staging/prism54/
PROC SYSCTL
M: "Luis R. Rodriguez"
diff --git a/drivers/net/wireless/intersil/Kconfig
b/drivers/net/wireless/intersil/Kconfig
index 9da136049955..2b056b6daef8 100644
--- a/drivers/net/wireless/intersil/Kconfig
+++ b/drivers/net/wireless/intersil/Kconfig
@@ -15,24 +15,4 @@ source "drivers/net/wireless/intersil/hostap/Kconfig"
source "drivers/net/wireless/intersil/orinoco/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
diff --git a/drivers/net/wireless/intersil/Makefile