浏览代码

isdn: i4l: move active-isdn drivers to staging

The icn, act2000 and pcbit drivers are all for very old hardware,
and it is highly unlikely that anyone is actually still using them
on modern kernels, if at all.

All three drivers apparently are for hardware that predates PCI
being the common connector, as they are ISA-only and active
PCI ISDN cards were widely available in the 1990s.

Looking through the git logs, it I cannot find any indication of a
patch to any of these drivers that has been tested on real hardware,
only cleanups or global API changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Arnd Bergmann 9 年之前
父节点
当前提交
a921e9bd4e
共有 37 个文件被更改,包括 24 次插入21 次删除
  1. 0 8
      Documentation/isdn/00-INDEX
  2. 0 3
      drivers/isdn/Makefile
  3. 0 10
      drivers/isdn/i4l/Kconfig
  4. 2 0
      drivers/staging/Kconfig
  5. 1 0
      drivers/staging/Makefile
  6. 0 0
      drivers/staging/i4l/Documentation/README.act2000
  7. 0 0
      drivers/staging/i4l/Documentation/README.icn
  8. 0 0
      drivers/staging/i4l/Documentation/README.pcbit
  9. 0 0
      drivers/staging/i4l/Documentation/README.sc
  10. 13 0
      drivers/staging/i4l/Kconfig
  11. 5 0
      drivers/staging/i4l/Makefile
  12. 3 0
      drivers/staging/i4l/TODO
  13. 0 0
      drivers/staging/i4l/act2000/Kconfig
  14. 0 0
      drivers/staging/i4l/act2000/Makefile
  15. 0 0
      drivers/staging/i4l/act2000/act2000.h
  16. 0 0
      drivers/staging/i4l/act2000/act2000_isa.c
  17. 0 0
      drivers/staging/i4l/act2000/act2000_isa.h
  18. 0 0
      drivers/staging/i4l/act2000/capi.c
  19. 0 0
      drivers/staging/i4l/act2000/capi.h
  20. 0 0
      drivers/staging/i4l/act2000/module.c
  21. 0 0
      drivers/staging/i4l/icn/Kconfig
  22. 0 0
      drivers/staging/i4l/icn/Makefile
  23. 0 0
      drivers/staging/i4l/icn/icn.c
  24. 0 0
      drivers/staging/i4l/icn/icn.h
  25. 0 0
      drivers/staging/i4l/pcbit/Kconfig
  26. 0 0
      drivers/staging/i4l/pcbit/Makefile
  27. 0 0
      drivers/staging/i4l/pcbit/callbacks.c
  28. 0 0
      drivers/staging/i4l/pcbit/callbacks.h
  29. 0 0
      drivers/staging/i4l/pcbit/capi.c
  30. 0 0
      drivers/staging/i4l/pcbit/capi.h
  31. 0 0
      drivers/staging/i4l/pcbit/drv.c
  32. 0 0
      drivers/staging/i4l/pcbit/edss1.c
  33. 0 0
      drivers/staging/i4l/pcbit/edss1.h
  34. 0 0
      drivers/staging/i4l/pcbit/layer2.c
  35. 0 0
      drivers/staging/i4l/pcbit/layer2.h
  36. 0 0
      drivers/staging/i4l/pcbit/module.c
  37. 0 0
      drivers/staging/i4l/pcbit/pcbit.h

+ 0 - 8
Documentation/isdn/00-INDEX

@@ -16,8 +16,6 @@ README.FAQ
 	- general info for FAQ.
 	- general info for FAQ.
 README.HiSax
 README.HiSax
 	- info on the HiSax driver which replaces the old teles.
 	- info on the HiSax driver which replaces the old teles.
-README.act2000
-	- info on driver for IBM ACT-2000 card.
 README.audio
 README.audio
 	- info for running audio over ISDN.
 	- info for running audio over ISDN.
 README.avmb1
 README.avmb1
@@ -34,14 +32,8 @@ README.hfc-pci
 	- info on hfc-pci based cards.
 	- info on hfc-pci based cards.
 README.hysdn
 README.hysdn
         - info on driver for Hypercope active HYSDN cards
         - info on driver for Hypercope active HYSDN cards
-README.icn
-	- info on the ICN-ISDN-card and its driver.
 README.mISDN
 README.mISDN
 	- info on the Modular ISDN subsystem (mISDN)
 	- info on the Modular ISDN subsystem (mISDN)
-README.pcbit
-	- info on the PCBIT-D ISDN adapter and driver.
-README.sc
-	- info on driver for Spellcaster cards.
 README.syncppp
 README.syncppp
 	- info on running Sync PPP over ISDN.
 	- info on running Sync PPP over ISDN.
 README.x25
 README.x25

+ 0 - 3
drivers/isdn/Makefile

@@ -8,9 +8,6 @@ obj-$(CONFIG_MISDN)			+= mISDN/
 obj-$(CONFIG_ISDN)			+= hardware/
 obj-$(CONFIG_ISDN)			+= hardware/
 obj-$(CONFIG_ISDN_DIVERSION)		+= divert/
 obj-$(CONFIG_ISDN_DIVERSION)		+= divert/
 obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax/
 obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax/
-obj-$(CONFIG_ISDN_DRV_ICN)		+= icn/
-obj-$(CONFIG_ISDN_DRV_PCBIT)		+= pcbit/
 obj-$(CONFIG_ISDN_DRV_LOOP)		+= isdnloop/
 obj-$(CONFIG_ISDN_DRV_LOOP)		+= isdnloop/
-obj-$(CONFIG_ISDN_DRV_ACT2000)		+= act2000/
 obj-$(CONFIG_HYSDN)			+= hysdn/
 obj-$(CONFIG_HYSDN)			+= hysdn/
 obj-$(CONFIG_ISDN_DRV_GIGASET)		+= gigaset/
 obj-$(CONFIG_ISDN_DRV_GIGASET)		+= gigaset/

+ 0 - 10
drivers/isdn/i4l/Kconfig

@@ -123,16 +123,6 @@ comment "ISDN4Linux hardware drivers"
 
 
 source "drivers/isdn/hisax/Kconfig"
 source "drivers/isdn/hisax/Kconfig"
 
 
-
-menu "Active cards"
-
-source "drivers/isdn/icn/Kconfig"
-
-source "drivers/isdn/pcbit/Kconfig"
-
-source "drivers/isdn/act2000/Kconfig"
-
-endmenu
 # end ISDN_I4L
 # end ISDN_I4L
 endif
 endif
 
 

+ 2 - 0
drivers/staging/Kconfig

@@ -104,4 +104,6 @@ source "drivers/staging/wilc1000/Kconfig"
 
 
 source "drivers/staging/most/Kconfig"
 source "drivers/staging/most/Kconfig"
 
 
+source "drivers/staging/i4l/Kconfig"
+
 endif # STAGING
 endif # STAGING

+ 1 - 0
drivers/staging/Makefile

@@ -41,3 +41,4 @@ obj-$(CONFIG_FB_TFT)		+= fbtft/
 obj-$(CONFIG_FSL_MC_BUS)	+= fsl-mc/
 obj-$(CONFIG_FSL_MC_BUS)	+= fsl-mc/
 obj-$(CONFIG_WILC1000)		+= wilc1000/
 obj-$(CONFIG_WILC1000)		+= wilc1000/
 obj-$(CONFIG_MOST)		+= most/
 obj-$(CONFIG_MOST)		+= most/
+obj-$(CONFIG_ISDN_I4L)		+= i4l/

+ 0 - 0
Documentation/isdn/README.act2000 → drivers/staging/i4l/Documentation/README.act2000


+ 0 - 0
Documentation/isdn/README.icn → drivers/staging/i4l/Documentation/README.icn


+ 0 - 0
Documentation/isdn/README.pcbit → drivers/staging/i4l/Documentation/README.pcbit


+ 0 - 0
Documentation/isdn/README.sc → drivers/staging/i4l/Documentation/README.sc


+ 13 - 0
drivers/staging/i4l/Kconfig

@@ -0,0 +1,13 @@
+#
+# Old ISDN4Linux config
+#
+menu "Old ISDN4Linux (deprecated)"
+	depends on ISDN_I4L
+
+source "drivers/staging/i4l/icn/Kconfig"
+
+source "drivers/staging/i4l/pcbit/Kconfig"
+
+source "drivers/staging/i4l/act2000/Kconfig"
+
+endmenu

+ 5 - 0
drivers/staging/i4l/Makefile

@@ -0,0 +1,5 @@
+# Makefile for the old ISDN I4L subsystem and device drivers.
+
+obj-$(CONFIG_ISDN_DRV_ICN)		+= icn/
+obj-$(CONFIG_ISDN_DRV_PCBIT)		+= pcbit/
+obj-$(CONFIG_ISDN_DRV_ACT2000)		+= act2000/

+ 3 - 0
drivers/staging/i4l/TODO

@@ -0,0 +1,3 @@
+* The icn, pcbit and act2000 drivers are dead, remove them in 2017
+  after another longterm kernel has been released, just in the
+  unlikely case someone still has this hardware.

+ 0 - 0
drivers/isdn/act2000/Kconfig → drivers/staging/i4l/act2000/Kconfig


+ 0 - 0
drivers/isdn/act2000/Makefile → drivers/staging/i4l/act2000/Makefile


+ 0 - 0
drivers/isdn/act2000/act2000.h → drivers/staging/i4l/act2000/act2000.h


+ 0 - 0
drivers/isdn/act2000/act2000_isa.c → drivers/staging/i4l/act2000/act2000_isa.c


+ 0 - 0
drivers/isdn/act2000/act2000_isa.h → drivers/staging/i4l/act2000/act2000_isa.h


+ 0 - 0
drivers/isdn/act2000/capi.c → drivers/staging/i4l/act2000/capi.c


+ 0 - 0
drivers/isdn/act2000/capi.h → drivers/staging/i4l/act2000/capi.h


+ 0 - 0
drivers/isdn/act2000/module.c → drivers/staging/i4l/act2000/module.c


+ 0 - 0
drivers/isdn/icn/Kconfig → drivers/staging/i4l/icn/Kconfig


+ 0 - 0
drivers/isdn/icn/Makefile → drivers/staging/i4l/icn/Makefile


+ 0 - 0
drivers/isdn/icn/icn.c → drivers/staging/i4l/icn/icn.c


+ 0 - 0
drivers/isdn/icn/icn.h → drivers/staging/i4l/icn/icn.h


+ 0 - 0
drivers/isdn/pcbit/Kconfig → drivers/staging/i4l/pcbit/Kconfig


+ 0 - 0
drivers/isdn/pcbit/Makefile → drivers/staging/i4l/pcbit/Makefile


+ 0 - 0
drivers/isdn/pcbit/callbacks.c → drivers/staging/i4l/pcbit/callbacks.c


+ 0 - 0
drivers/isdn/pcbit/callbacks.h → drivers/staging/i4l/pcbit/callbacks.h


+ 0 - 0
drivers/isdn/pcbit/capi.c → drivers/staging/i4l/pcbit/capi.c


+ 0 - 0
drivers/isdn/pcbit/capi.h → drivers/staging/i4l/pcbit/capi.h


+ 0 - 0
drivers/isdn/pcbit/drv.c → drivers/staging/i4l/pcbit/drv.c


+ 0 - 0
drivers/isdn/pcbit/edss1.c → drivers/staging/i4l/pcbit/edss1.c


+ 0 - 0
drivers/isdn/pcbit/edss1.h → drivers/staging/i4l/pcbit/edss1.h


+ 0 - 0
drivers/isdn/pcbit/layer2.c → drivers/staging/i4l/pcbit/layer2.c


+ 0 - 0
drivers/isdn/pcbit/layer2.h → drivers/staging/i4l/pcbit/layer2.h


+ 0 - 0
drivers/isdn/pcbit/module.c → drivers/staging/i4l/pcbit/module.c


+ 0 - 0
drivers/isdn/pcbit/pcbit.h → drivers/staging/i4l/pcbit/pcbit.h