diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 20:06:46 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-05 15:00:38 -0800 |
commit | a921e9bd4e22a792279e46f97a85891a3d5f1b7d (patch) | |
tree | fe4192cf75e8705272729a611f4bc71146f5f8f3 | |
parent | 01ed1e1504ac83a8b0b365c9f55d3427babbd7d9 (diff) | |
download | linux-0-day-a921e9bd4e22a792279e46f97a85891a3d5f1b7d.tar.gz linux-0-day-a921e9bd4e22a792279e46f97a85891a3d5f1b7d.tar.xz |
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>
-rw-r--r-- | Documentation/isdn/00-INDEX | 8 | ||||
-rw-r--r-- | drivers/isdn/Makefile | 3 | ||||
-rw-r--r-- | drivers/isdn/i4l/Kconfig | 10 | ||||
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/i4l/Documentation/README.act2000 (renamed from Documentation/isdn/README.act2000) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/Documentation/README.icn (renamed from Documentation/isdn/README.icn) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/Documentation/README.pcbit (renamed from Documentation/isdn/README.pcbit) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/Documentation/README.sc (renamed from Documentation/isdn/README.sc) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/Kconfig | 13 | ||||
-rw-r--r-- | drivers/staging/i4l/Makefile | 5 | ||||
-rw-r--r-- | drivers/staging/i4l/TODO | 3 | ||||
-rw-r--r-- | drivers/staging/i4l/act2000/Kconfig (renamed from drivers/isdn/act2000/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/act2000/Makefile (renamed from drivers/isdn/act2000/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/act2000/act2000.h (renamed from drivers/isdn/act2000/act2000.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/act2000/act2000_isa.c (renamed from drivers/isdn/act2000/act2000_isa.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/act2000/act2000_isa.h (renamed from drivers/isdn/act2000/act2000_isa.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/act2000/capi.c (renamed from drivers/isdn/act2000/capi.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/act2000/capi.h (renamed from drivers/isdn/act2000/capi.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/act2000/module.c (renamed from drivers/isdn/act2000/module.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/icn/Kconfig (renamed from drivers/isdn/icn/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/icn/Makefile (renamed from drivers/isdn/icn/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/icn/icn.c (renamed from drivers/isdn/icn/icn.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/icn/icn.h (renamed from drivers/isdn/icn/icn.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/Kconfig (renamed from drivers/isdn/pcbit/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/Makefile (renamed from drivers/isdn/pcbit/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/callbacks.c (renamed from drivers/isdn/pcbit/callbacks.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/callbacks.h (renamed from drivers/isdn/pcbit/callbacks.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/capi.c (renamed from drivers/isdn/pcbit/capi.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/capi.h (renamed from drivers/isdn/pcbit/capi.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/drv.c (renamed from drivers/isdn/pcbit/drv.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/edss1.c (renamed from drivers/isdn/pcbit/edss1.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/edss1.h (renamed from drivers/isdn/pcbit/edss1.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/layer2.c (renamed from drivers/isdn/pcbit/layer2.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/layer2.h (renamed from drivers/isdn/pcbit/layer2.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/module.c (renamed from drivers/isdn/pcbit/module.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i4l/pcbit/pcbit.h (renamed from drivers/isdn/pcbit/pcbit.h) | 0 |
37 files changed, 24 insertions, 21 deletions
diff --git a/Documentation/isdn/00-INDEX b/Documentation/isdn/00-INDEX index e87e336f590ef..2d1889b6c1fa8 100644 --- a/Documentation/isdn/00-INDEX +++ b/Documentation/isdn/00-INDEX @@ -16,8 +16,6 @@ README.FAQ - general info for FAQ. README.HiSax - info on the HiSax driver which replaces the old teles. -README.act2000 - - info on driver for IBM ACT-2000 card. README.audio - info for running audio over ISDN. README.avmb1 @@ -34,14 +32,8 @@ README.hfc-pci - info on hfc-pci based cards. README.hysdn - info on driver for Hypercope active HYSDN cards -README.icn - - info on the ICN-ISDN-card and its driver. README.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 - info on running Sync PPP over ISDN. README.x25 diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile index 91c81965e7ca2..c32e45826c2c3 100644 --- a/drivers/isdn/Makefile +++ b/drivers/isdn/Makefile @@ -8,9 +8,6 @@ obj-$(CONFIG_MISDN) += mISDN/ obj-$(CONFIG_ISDN) += hardware/ obj-$(CONFIG_ISDN_DIVERSION) += divert/ 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_ACT2000) += act2000/ obj-$(CONFIG_HYSDN) += hysdn/ obj-$(CONFIG_ISDN_DRV_GIGASET) += gigaset/ diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig index f5b714cd76189..68e54d9f2f538 100644 --- a/drivers/isdn/i4l/Kconfig +++ b/drivers/isdn/i4l/Kconfig @@ -123,16 +123,6 @@ comment "ISDN4Linux hardware drivers" 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 endif diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 5f9a97a773931..ff894bc63b3bf 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -104,4 +104,6 @@ source "drivers/staging/wilc1000/Kconfig" source "drivers/staging/most/Kconfig" +source "drivers/staging/i4l/Kconfig" + endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index b3920c224013c..8242923371ad9 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -41,3 +41,4 @@ obj-$(CONFIG_FB_TFT) += fbtft/ obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/ obj-$(CONFIG_WILC1000) += wilc1000/ obj-$(CONFIG_MOST) += most/ +obj-$(CONFIG_ISDN_I4L) += i4l/ diff --git a/Documentation/isdn/README.act2000 b/drivers/staging/i4l/Documentation/README.act2000 index ce7115e7f4cec..ce7115e7f4cec 100644 --- a/Documentation/isdn/README.act2000 +++ b/drivers/staging/i4l/Documentation/README.act2000 diff --git a/Documentation/isdn/README.icn b/drivers/staging/i4l/Documentation/README.icn index 13f833d4e910c..13f833d4e910c 100644 --- a/Documentation/isdn/README.icn +++ b/drivers/staging/i4l/Documentation/README.icn diff --git a/Documentation/isdn/README.pcbit b/drivers/staging/i4l/Documentation/README.pcbit index 5125002282e5e..5125002282e5e 100644 --- a/Documentation/isdn/README.pcbit +++ b/drivers/staging/i4l/Documentation/README.pcbit diff --git a/Documentation/isdn/README.sc b/drivers/staging/i4l/Documentation/README.sc index 1153cd9260590..1153cd9260590 100644 --- a/Documentation/isdn/README.sc +++ b/drivers/staging/i4l/Documentation/README.sc diff --git a/drivers/staging/i4l/Kconfig b/drivers/staging/i4l/Kconfig new file mode 100644 index 0000000000000..920216e88de78 --- /dev/null +++ b/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 diff --git a/drivers/staging/i4l/Makefile b/drivers/staging/i4l/Makefile new file mode 100644 index 0000000000000..158b87093db50 --- /dev/null +++ b/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/ diff --git a/drivers/staging/i4l/TODO b/drivers/staging/i4l/TODO new file mode 100644 index 0000000000000..6fe2c08bec7a2 --- /dev/null +++ b/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. diff --git a/drivers/isdn/act2000/Kconfig b/drivers/staging/i4l/act2000/Kconfig index fa2673fc69c25..fa2673fc69c25 100644 --- a/drivers/isdn/act2000/Kconfig +++ b/drivers/staging/i4l/act2000/Kconfig diff --git a/drivers/isdn/act2000/Makefile b/drivers/staging/i4l/act2000/Makefile index 05e582fb5c00f..05e582fb5c00f 100644 --- a/drivers/isdn/act2000/Makefile +++ b/drivers/staging/i4l/act2000/Makefile diff --git a/drivers/isdn/act2000/act2000.h b/drivers/staging/i4l/act2000/act2000.h index 321d437f579e1..321d437f579e1 100644 --- a/drivers/isdn/act2000/act2000.h +++ b/drivers/staging/i4l/act2000/act2000.h diff --git a/drivers/isdn/act2000/act2000_isa.c b/drivers/staging/i4l/act2000/act2000_isa.c index b5fad29a9ba60..b5fad29a9ba60 100644 --- a/drivers/isdn/act2000/act2000_isa.c +++ b/drivers/staging/i4l/act2000/act2000_isa.c diff --git a/drivers/isdn/act2000/act2000_isa.h b/drivers/staging/i4l/act2000/act2000_isa.h index 1a728984ede16..1a728984ede16 100644 --- a/drivers/isdn/act2000/act2000_isa.h +++ b/drivers/staging/i4l/act2000/act2000_isa.h diff --git a/drivers/isdn/act2000/capi.c b/drivers/staging/i4l/act2000/capi.c index 3f66ca20b5e54..3f66ca20b5e54 100644 --- a/drivers/isdn/act2000/capi.c +++ b/drivers/staging/i4l/act2000/capi.c diff --git a/drivers/isdn/act2000/capi.h b/drivers/staging/i4l/act2000/capi.h index 01ccdecd43f76..01ccdecd43f76 100644 --- a/drivers/isdn/act2000/capi.h +++ b/drivers/staging/i4l/act2000/capi.h diff --git a/drivers/isdn/act2000/module.c b/drivers/staging/i4l/act2000/module.c index 68073d0da0e30..68073d0da0e30 100644 --- a/drivers/isdn/act2000/module.c +++ b/drivers/staging/i4l/act2000/module.c diff --git a/drivers/isdn/icn/Kconfig b/drivers/staging/i4l/icn/Kconfig index 4534f21a18522..4534f21a18522 100644 --- a/drivers/isdn/icn/Kconfig +++ b/drivers/staging/i4l/icn/Kconfig diff --git a/drivers/isdn/icn/Makefile b/drivers/staging/i4l/icn/Makefile index d9b476fcf3845..d9b476fcf3845 100644 --- a/drivers/isdn/icn/Makefile +++ b/drivers/staging/i4l/icn/Makefile diff --git a/drivers/isdn/icn/icn.c b/drivers/staging/i4l/icn/icn.c index 46d957c34be1e..46d957c34be1e 100644 --- a/drivers/isdn/icn/icn.c +++ b/drivers/staging/i4l/icn/icn.c diff --git a/drivers/isdn/icn/icn.h b/drivers/staging/i4l/icn/icn.h index f8f2e76d34bf3..f8f2e76d34bf3 100644 --- a/drivers/isdn/icn/icn.h +++ b/drivers/staging/i4l/icn/icn.h diff --git a/drivers/isdn/pcbit/Kconfig b/drivers/staging/i4l/pcbit/Kconfig index e9b2dd85d4104..e9b2dd85d4104 100644 --- a/drivers/isdn/pcbit/Kconfig +++ b/drivers/staging/i4l/pcbit/Kconfig diff --git a/drivers/isdn/pcbit/Makefile b/drivers/staging/i4l/pcbit/Makefile index 2d026c3242e86..2d026c3242e86 100644 --- a/drivers/isdn/pcbit/Makefile +++ b/drivers/staging/i4l/pcbit/Makefile diff --git a/drivers/isdn/pcbit/callbacks.c b/drivers/staging/i4l/pcbit/callbacks.c index efb6d6a3639ae..efb6d6a3639ae 100644 --- a/drivers/isdn/pcbit/callbacks.c +++ b/drivers/staging/i4l/pcbit/callbacks.c diff --git a/drivers/isdn/pcbit/callbacks.h b/drivers/staging/i4l/pcbit/callbacks.h index a036b4a7ffad8..a036b4a7ffad8 100644 --- a/drivers/isdn/pcbit/callbacks.h +++ b/drivers/staging/i4l/pcbit/callbacks.h diff --git a/drivers/isdn/pcbit/capi.c b/drivers/staging/i4l/pcbit/capi.c index 4e3cbf857d606..4e3cbf857d606 100644 --- a/drivers/isdn/pcbit/capi.c +++ b/drivers/staging/i4l/pcbit/capi.c diff --git a/drivers/isdn/pcbit/capi.h b/drivers/staging/i4l/pcbit/capi.h index 635f63476944d..635f63476944d 100644 --- a/drivers/isdn/pcbit/capi.h +++ b/drivers/staging/i4l/pcbit/capi.h diff --git a/drivers/isdn/pcbit/drv.c b/drivers/staging/i4l/pcbit/drv.c index 4172e22ae7ed2..4172e22ae7ed2 100644 --- a/drivers/isdn/pcbit/drv.c +++ b/drivers/staging/i4l/pcbit/drv.c diff --git a/drivers/isdn/pcbit/edss1.c b/drivers/staging/i4l/pcbit/edss1.c index b2262ba6f0c9a..b2262ba6f0c9a 100644 --- a/drivers/isdn/pcbit/edss1.c +++ b/drivers/staging/i4l/pcbit/edss1.c diff --git a/drivers/isdn/pcbit/edss1.h b/drivers/staging/i4l/pcbit/edss1.h index 2f6b3a8edfba6..2f6b3a8edfba6 100644 --- a/drivers/isdn/pcbit/edss1.h +++ b/drivers/staging/i4l/pcbit/edss1.h diff --git a/drivers/isdn/pcbit/layer2.c b/drivers/staging/i4l/pcbit/layer2.c index 46e1240ae0741..46e1240ae0741 100644 --- a/drivers/isdn/pcbit/layer2.c +++ b/drivers/staging/i4l/pcbit/layer2.c diff --git a/drivers/isdn/pcbit/layer2.h b/drivers/staging/i4l/pcbit/layer2.h index be1327bc162a8..be1327bc162a8 100644 --- a/drivers/isdn/pcbit/layer2.h +++ b/drivers/staging/i4l/pcbit/layer2.h diff --git a/drivers/isdn/pcbit/module.c b/drivers/staging/i4l/pcbit/module.c index 0a59bd0b8210f..0a59bd0b8210f 100644 --- a/drivers/isdn/pcbit/module.c +++ b/drivers/staging/i4l/pcbit/module.c diff --git a/drivers/isdn/pcbit/pcbit.h b/drivers/staging/i4l/pcbit/pcbit.h index 0a5a99440a807..0a5a99440a807 100644 --- a/drivers/isdn/pcbit/pcbit.h +++ b/drivers/staging/i4l/pcbit/pcbit.h |