From patchwork Wed Mar 2 19:06:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102609 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2548857lbc; Wed, 2 Mar 2016 11:07:49 -0800 (PST) X-Received: by 10.98.16.4 with SMTP id y4mr11999565pfi.45.1456945669221; Wed, 02 Mar 2016 11:07:49 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kv12si21214693pab.194.2016.03.02.11.07.48; Wed, 02 Mar 2016 11:07:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755904AbcCBTHr (ORCPT + 30 others); Wed, 2 Mar 2016 14:07:47 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:63265 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752460AbcCBTHq (ORCPT ); Wed, 2 Mar 2016 14:07:46 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0LfbRK-1a87p22N1m-00pKlm; Wed, 02 Mar 2016 20:07:14 +0100 From: Arnd Bergmann To: Karsten Keil Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] isdn: icn: remove a #warning Date: Wed, 2 Mar 2016 20:06:45 +0100 Message-Id: <1456945629-1793533-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:FEFMFlIU1XQBon9mmzdJznu0uMmCTkpJn5uMTkzkDaYGNuHKvL6 mBWU3D9RkOsANTRVw8ZHFF+yqKpJy07qvsDpGy2z581M4ns8D65opETfEJjPUIO0db8wn8d iuwYbwPmfkryN2/Om79G7YEHHCDC58lgHjmN/HhcTR0vzRkuV4DEiVnt3sspNUVUPhWKenV e8qpKG+x2k0XuMiIqBkoA== X-UI-Out-Filterresults: notjunk:1; V01:K0:4c8lTejD4cU=:BPlPfJEprMwNy7iWf1mbR+ iyTt/U+PG6o6r28hvIvL2bAMhm/LSnIpNF7GskBb5/8j7ms00Cb+bt/8ZRE0miZkpEm3qbFNb IK6lYsEUn04MRg1AcY1lDfJLfZA9sGsutLJ8rkPtNkUlu75CMg6oZFqK1YG5wZcFIgOCEC6cZ GPKUd6vjtEH7sroZs5t6Fs/NuW1snDf2dsOFJjmqSy1RSfYqTaWCpydTOBqXLReZ8+ZJr+yOt htvcsqE9o2k32xoklO4rXi/ilfR6et9yKS/EYGH5bCbxIcT+zT+zOgiorrouK/eh5sOjBnz7x c5JPsgHZ7v5N1pdmrT38CeCl4jOjPofZWJHcIIuFdIjEyP13Q3bketXv2Bo2N1c6pIUdzM5PW 7TbZZUpufqt90Qs35SEotsjLWdMYuZKZMOVMXGVKmVFBoilyVSeXRgLPJ6FpMXIqRnlM5bt45 XlcF3PlPkSxlNqWODooBgNCdsanQ4YF1ELP0kJA4ccYWZJtsuOP2Mwbw4Mbr4CpQ5Z+InmEKg KN/uhSbYXsRGU85sCeqX5aUUJ1iRNaftp/ot+k0+VA9D5klnTXYPd2U9xr6FUTSJ5JjeyLfM+ v5m1ruHY1jOVel7dmSWqGFiDNnzkrLdsGs3GOyQ6Ks/YG3pvGmq8ZzTANtr0ZFECldaEzpNlE 3qGHssSoSYGrnbIGbjEdMwIKQ/ae2VjgLqMAHV2W2w7nL+Q0gnGYua92euWHAlzU3QKs= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The icn driver currently produces an unconditional #warning whenever we build it, introduced by Karsten Keil back in 2003: #warning TODO test headroom or use skb->nb to flag ACK Karsten's original commit (from BitKeeper) contains this description: - here are lot of bugs left, so ISDN is not stable yet but I think it's really time to fix it, even if it need some cycles to get it right (normally I'm only send patches if it works 100% for me). - I add some additional #warnings to address places which need fixing (I hope that some of the other ISDN developer jump in) Apparently this has not happened, and it is unlikely that it ever will, given that the driver doesn't seem to work. No substantial bug fixes other than janitorial cleanups have happened in the driver since then, and I see no indication that anyone who patched it had the hardware. We should probably either remove the driver, or remove all of i4l, but for now, this shuts up the distracting #warning by turning it into a comment. Signed-off-by: Arnd Bergmann Link: http://git.meleeweb.net/linux.git/commit/?id=b0deac0886b0056765afd149e9834373b38e096b --- drivers/isdn/icn/icn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c index 358a574d9e8b..46d957c34be1 100644 --- a/drivers/isdn/icn/icn.c +++ b/drivers/isdn/icn/icn.c @@ -718,7 +718,7 @@ icn_sendbuf(int channel, int ack, struct sk_buff *skb, icn_card *card) return 0; if (card->sndcount[channel] > ICN_MAX_SQUEUE) return 0; -#warning TODO test headroom or use skb->nb to flag ACK + /* TODO test headroom or use skb->nb to flag ACK */ nskb = skb_clone(skb, GFP_ATOMIC); if (nskb) { /* Push ACK flag as one From patchwork Wed Mar 2 19:06:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102608 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2549231lbc; Wed, 2 Mar 2016 11:08:31 -0800 (PST) X-Received: by 10.98.17.208 with SMTP id 77mr40117551pfr.37.1456945711783; Wed, 02 Mar 2016 11:08:31 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q14si12312213pfi.166.2016.03.02.11.08.31; Wed, 02 Mar 2016 11:08:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756527AbcCBTIa (ORCPT + 30 others); Wed, 2 Mar 2016 14:08:30 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:57863 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753056AbcCBTI1 (ORCPT ); Wed, 2 Mar 2016 14:08:27 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0LvN23-1ZsXne0NMp-010gUN; Wed, 02 Mar 2016 20:07:53 +0100 From: Arnd Bergmann To: Karsten Keil , Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Jonathan Corbet , "David S. Miller" , netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH 2/2] isdn: i4l: move active-isdn drivers to staging Date: Wed, 2 Mar 2016 20:06:46 +0100 Message-Id: <1456945629-1793533-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456945629-1793533-1-git-send-email-arnd@arndb.de> References: <1456945629-1793533-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:Z2+AGQtrv+nxQkwH9iy+FYcWSrF/9Tyg1tKSKx1o2S045s9hXPz KE1A2z6Y6oDChg/G8tmRxU99mv01ewEkAVyog/2zfPzKr9tF0GDnxkQW9UydHSOU+nJ3n9q 88IDwRWvfgcD+bV/QvX/wcBAwvlpZ2zQPcsEBFMdHb/uZygf6wlGf8x5tn/BE0W+8C9gUnF kFyubB+0e+jzuYzuXdF4Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:oswuT8EF04Q=:O4afLMvl7qR073HF9IbAcH jlI9kbrUSkohtRdJZYRNLxzbabqL1T91QGs38uHg1qYnKa/py5qcxcUDMj3lB+7ix8cyl8uWn 2GXdlwwMK5Ml7NU01aiMnDNyHSVMhfxeqv6nP1J7GkpNPX9m55YHvc9w+Cz+DgcJtd+gUOiDK LaiqKv6Azmt1/Ywf/89xJW9Lmwz9OYZvPMFHKWt/3y2K/XhSUjIiaeDJ9tADPBADnP4BU0MZM p9pET/L8JvgiE8GyKhoJ0Xx1llohB1shlA7DnWsqwBYwtgKMbQdJqCLF9zidqfMYCkg+ssHKd 14I7PhLgki5OjjPkeTikHVrEV/vx5Manh+DaOuDkTPmu9nIPy//BGSOC7PVQIxdGfK44IhKYs /2WANz5stLjnKofYdHjp34G7l0b4vGa3BAG1rlDrMb5VsZgFoyMAJlJWY/2qZTctuWAtTaUUz IJM2xpIUCI4lVu2I2rATpJFD4riDB2vLPzLuFDI3hL5X2aDOEz3GrykL/zAgJ0LH01ZD1aNY4 e4raJKihtlXkLCODaGdVnzz8d6Q7zILVlfUHpyIKTpIJ3Ea6MV7HL+8QhLAZWpoGsJ0aJwPTC slEXh0dD9QZbuvvn3EsTshO+NoZoZ/QckHFnOO8pDmUVJbZUyb3mMjcmuwUyRM8ooGPbikrR6 PXlEcgOxRfJ3TLKycMoBH35c1EdQ6JcoLcd5Rh+4TGAPB8Z+lLzn+HsU/NizdggVpPwc= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Documentation/isdn/00-INDEX | 8 -------- drivers/isdn/Makefile | 3 --- drivers/isdn/i4l/Kconfig | 10 ---------- drivers/staging/Kconfig | 2 ++ drivers/staging/Makefile | 1 + .../staging/i4l/Documentation}/README.act2000 | 0 .../isdn => drivers/staging/i4l/Documentation}/README.icn | 0 .../isdn => drivers/staging/i4l/Documentation}/README.pcbit | 0 .../isdn => drivers/staging/i4l/Documentation}/README.sc | 0 drivers/staging/i4l/Kconfig | 13 +++++++++++++ drivers/staging/i4l/Makefile | 5 +++++ drivers/staging/i4l/TODO | 3 +++ drivers/{isdn => staging/i4l}/act2000/Kconfig | 0 drivers/{isdn => staging/i4l}/act2000/Makefile | 0 drivers/{isdn => staging/i4l}/act2000/act2000.h | 0 drivers/{isdn => staging/i4l}/act2000/act2000_isa.c | 0 drivers/{isdn => staging/i4l}/act2000/act2000_isa.h | 0 drivers/{isdn => staging/i4l}/act2000/capi.c | 0 drivers/{isdn => staging/i4l}/act2000/capi.h | 0 drivers/{isdn => staging/i4l}/act2000/module.c | 0 drivers/{isdn => staging/i4l}/icn/Kconfig | 0 drivers/{isdn => staging/i4l}/icn/Makefile | 0 drivers/{isdn => staging/i4l}/icn/icn.c | 0 drivers/{isdn => staging/i4l}/icn/icn.h | 0 drivers/{isdn => staging/i4l}/pcbit/Kconfig | 0 drivers/{isdn => staging/i4l}/pcbit/Makefile | 0 drivers/{isdn => staging/i4l}/pcbit/callbacks.c | 0 drivers/{isdn => staging/i4l}/pcbit/callbacks.h | 0 drivers/{isdn => staging/i4l}/pcbit/capi.c | 0 drivers/{isdn => staging/i4l}/pcbit/capi.h | 0 drivers/{isdn => staging/i4l}/pcbit/drv.c | 0 drivers/{isdn => staging/i4l}/pcbit/edss1.c | 0 drivers/{isdn => staging/i4l}/pcbit/edss1.h | 0 drivers/{isdn => staging/i4l}/pcbit/layer2.c | 0 drivers/{isdn => staging/i4l}/pcbit/layer2.h | 0 drivers/{isdn => staging/i4l}/pcbit/module.c | 0 drivers/{isdn => staging/i4l}/pcbit/pcbit.h | 0 37 files changed, 24 insertions(+), 21 deletions(-) rename {Documentation/isdn => drivers/staging/i4l/Documentation}/README.act2000 (100%) rename {Documentation/isdn => drivers/staging/i4l/Documentation}/README.icn (100%) rename {Documentation/isdn => drivers/staging/i4l/Documentation}/README.pcbit (100%) rename {Documentation/isdn => drivers/staging/i4l/Documentation}/README.sc (100%) create mode 100644 drivers/staging/i4l/Kconfig create mode 100644 drivers/staging/i4l/Makefile create mode 100644 drivers/staging/i4l/TODO rename drivers/{isdn => staging/i4l}/act2000/Kconfig (100%) rename drivers/{isdn => staging/i4l}/act2000/Makefile (100%) rename drivers/{isdn => staging/i4l}/act2000/act2000.h (100%) rename drivers/{isdn => staging/i4l}/act2000/act2000_isa.c (100%) rename drivers/{isdn => staging/i4l}/act2000/act2000_isa.h (100%) rename drivers/{isdn => staging/i4l}/act2000/capi.c (100%) rename drivers/{isdn => staging/i4l}/act2000/capi.h (100%) rename drivers/{isdn => staging/i4l}/act2000/module.c (100%) rename drivers/{isdn => staging/i4l}/icn/Kconfig (100%) rename drivers/{isdn => staging/i4l}/icn/Makefile (100%) rename drivers/{isdn => staging/i4l}/icn/icn.c (100%) rename drivers/{isdn => staging/i4l}/icn/icn.h (100%) rename drivers/{isdn => staging/i4l}/pcbit/Kconfig (100%) rename drivers/{isdn => staging/i4l}/pcbit/Makefile (100%) rename drivers/{isdn => staging/i4l}/pcbit/callbacks.c (100%) rename drivers/{isdn => staging/i4l}/pcbit/callbacks.h (100%) rename drivers/{isdn => staging/i4l}/pcbit/capi.c (100%) rename drivers/{isdn => staging/i4l}/pcbit/capi.h (100%) rename drivers/{isdn => staging/i4l}/pcbit/drv.c (100%) rename drivers/{isdn => staging/i4l}/pcbit/edss1.c (100%) rename drivers/{isdn => staging/i4l}/pcbit/edss1.h (100%) rename drivers/{isdn => staging/i4l}/pcbit/layer2.c (100%) rename drivers/{isdn => staging/i4l}/pcbit/layer2.h (100%) rename drivers/{isdn => staging/i4l}/pcbit/module.c (100%) rename drivers/{isdn => staging/i4l}/pcbit/pcbit.h (100%) -- 2.7.0 diff --git a/Documentation/isdn/00-INDEX b/Documentation/isdn/00-INDEX index e87e336f590e..2d1889b6c1fa 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 91c81965e7ca..c32e45826c2c 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 f5b714cd7618..68e54d9f2f53 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 5f9a97a77393..ff894bc63b3b 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 b3920c224013..8242923371ad 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 similarity index 100% rename from Documentation/isdn/README.act2000 rename to drivers/staging/i4l/Documentation/README.act2000 diff --git a/Documentation/isdn/README.icn b/drivers/staging/i4l/Documentation/README.icn similarity index 100% rename from Documentation/isdn/README.icn rename to drivers/staging/i4l/Documentation/README.icn diff --git a/Documentation/isdn/README.pcbit b/drivers/staging/i4l/Documentation/README.pcbit similarity index 100% rename from Documentation/isdn/README.pcbit rename to drivers/staging/i4l/Documentation/README.pcbit diff --git a/Documentation/isdn/README.sc b/drivers/staging/i4l/Documentation/README.sc similarity index 100% rename from Documentation/isdn/README.sc rename to drivers/staging/i4l/Documentation/README.sc diff --git a/drivers/staging/i4l/Kconfig b/drivers/staging/i4l/Kconfig new file mode 100644 index 000000000000..920216e88de7 --- /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 000000000000..158b87093db5 --- /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 000000000000..6fe2c08bec7a --- /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 similarity index 100% rename from drivers/isdn/act2000/Kconfig rename to drivers/staging/i4l/act2000/Kconfig diff --git a/drivers/isdn/act2000/Makefile b/drivers/staging/i4l/act2000/Makefile similarity index 100% rename from drivers/isdn/act2000/Makefile rename to drivers/staging/i4l/act2000/Makefile diff --git a/drivers/isdn/act2000/act2000.h b/drivers/staging/i4l/act2000/act2000.h similarity index 100% rename from drivers/isdn/act2000/act2000.h rename to drivers/staging/i4l/act2000/act2000.h diff --git a/drivers/isdn/act2000/act2000_isa.c b/drivers/staging/i4l/act2000/act2000_isa.c similarity index 100% rename from drivers/isdn/act2000/act2000_isa.c rename to drivers/staging/i4l/act2000/act2000_isa.c diff --git a/drivers/isdn/act2000/act2000_isa.h b/drivers/staging/i4l/act2000/act2000_isa.h similarity index 100% rename from drivers/isdn/act2000/act2000_isa.h rename to drivers/staging/i4l/act2000/act2000_isa.h diff --git a/drivers/isdn/act2000/capi.c b/drivers/staging/i4l/act2000/capi.c similarity index 100% rename from drivers/isdn/act2000/capi.c rename to drivers/staging/i4l/act2000/capi.c diff --git a/drivers/isdn/act2000/capi.h b/drivers/staging/i4l/act2000/capi.h similarity index 100% rename from drivers/isdn/act2000/capi.h rename to drivers/staging/i4l/act2000/capi.h diff --git a/drivers/isdn/act2000/module.c b/drivers/staging/i4l/act2000/module.c similarity index 100% rename from drivers/isdn/act2000/module.c rename to drivers/staging/i4l/act2000/module.c diff --git a/drivers/isdn/icn/Kconfig b/drivers/staging/i4l/icn/Kconfig similarity index 100% rename from drivers/isdn/icn/Kconfig rename to drivers/staging/i4l/icn/Kconfig diff --git a/drivers/isdn/icn/Makefile b/drivers/staging/i4l/icn/Makefile similarity index 100% rename from drivers/isdn/icn/Makefile rename to drivers/staging/i4l/icn/Makefile diff --git a/drivers/isdn/icn/icn.c b/drivers/staging/i4l/icn/icn.c similarity index 100% rename from drivers/isdn/icn/icn.c rename to drivers/staging/i4l/icn/icn.c diff --git a/drivers/isdn/icn/icn.h b/drivers/staging/i4l/icn/icn.h similarity index 100% rename from drivers/isdn/icn/icn.h rename to drivers/staging/i4l/icn/icn.h diff --git a/drivers/isdn/pcbit/Kconfig b/drivers/staging/i4l/pcbit/Kconfig similarity index 100% rename from drivers/isdn/pcbit/Kconfig rename to drivers/staging/i4l/pcbit/Kconfig diff --git a/drivers/isdn/pcbit/Makefile b/drivers/staging/i4l/pcbit/Makefile similarity index 100% rename from drivers/isdn/pcbit/Makefile rename to drivers/staging/i4l/pcbit/Makefile diff --git a/drivers/isdn/pcbit/callbacks.c b/drivers/staging/i4l/pcbit/callbacks.c similarity index 100% rename from drivers/isdn/pcbit/callbacks.c rename to drivers/staging/i4l/pcbit/callbacks.c diff --git a/drivers/isdn/pcbit/callbacks.h b/drivers/staging/i4l/pcbit/callbacks.h similarity index 100% rename from drivers/isdn/pcbit/callbacks.h rename to drivers/staging/i4l/pcbit/callbacks.h diff --git a/drivers/isdn/pcbit/capi.c b/drivers/staging/i4l/pcbit/capi.c similarity index 100% rename from drivers/isdn/pcbit/capi.c rename to drivers/staging/i4l/pcbit/capi.c diff --git a/drivers/isdn/pcbit/capi.h b/drivers/staging/i4l/pcbit/capi.h similarity index 100% rename from drivers/isdn/pcbit/capi.h rename to drivers/staging/i4l/pcbit/capi.h diff --git a/drivers/isdn/pcbit/drv.c b/drivers/staging/i4l/pcbit/drv.c similarity index 100% rename from drivers/isdn/pcbit/drv.c rename to drivers/staging/i4l/pcbit/drv.c diff --git a/drivers/isdn/pcbit/edss1.c b/drivers/staging/i4l/pcbit/edss1.c similarity index 100% rename from drivers/isdn/pcbit/edss1.c rename to drivers/staging/i4l/pcbit/edss1.c diff --git a/drivers/isdn/pcbit/edss1.h b/drivers/staging/i4l/pcbit/edss1.h similarity index 100% rename from drivers/isdn/pcbit/edss1.h rename to drivers/staging/i4l/pcbit/edss1.h diff --git a/drivers/isdn/pcbit/layer2.c b/drivers/staging/i4l/pcbit/layer2.c similarity index 100% rename from drivers/isdn/pcbit/layer2.c rename to drivers/staging/i4l/pcbit/layer2.c diff --git a/drivers/isdn/pcbit/layer2.h b/drivers/staging/i4l/pcbit/layer2.h similarity index 100% rename from drivers/isdn/pcbit/layer2.h rename to drivers/staging/i4l/pcbit/layer2.h diff --git a/drivers/isdn/pcbit/module.c b/drivers/staging/i4l/pcbit/module.c similarity index 100% rename from drivers/isdn/pcbit/module.c rename to drivers/staging/i4l/pcbit/module.c diff --git a/drivers/isdn/pcbit/pcbit.h b/drivers/staging/i4l/pcbit/pcbit.h similarity index 100% rename from drivers/isdn/pcbit/pcbit.h rename to drivers/staging/i4l/pcbit/pcbit.h