The last remnant of the isdn4linux interface is now the isdnhdlc
support, used by the netjet driver. Move it next to that driver.
Signed-off-by: Arnd Bergmann <a...@arndb.de>
---
drivers/isdn/Makefile | 1 -
drivers/isdn/hardware/mISDN/Kconfig | 7 +++++--
drivers/isdn/hardware/mISDN/Makefile | 2 ++
drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c | 2 +-
.../isdn/hdlc.h => drivers/isdn/hardware/mISDN/isdnhdlc.h | 0
drivers/isdn/hardware/mISDN/netjet.c | 2 +-
drivers/isdn/i4l/Makefile | 6 ------
7 files changed, 9 insertions(+), 11 deletions(-)
rename drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c (99%)
rename include/linux/isdn/hdlc.h => drivers/isdn/hardware/mISDN/isdnhdlc.h
(100%)
delete mode 100644 drivers/isdn/i4l/Makefile
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index 379b4a03c321..f2a529c5a511 100644
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -3,7 +3,6 @@
# Object files in subdirectories
-obj-$(CONFIG_ISDN_I4L) += i4l/
obj-$(CONFIG_ISDN_CAPI) += capi/
obj-$(CONFIG_MISDN) += mISDN/
obj-$(CONFIG_ISDN) += hardware/
diff --git a/drivers/isdn/hardware/mISDN/Kconfig
b/drivers/isdn/hardware/mISDN/Kconfig
index fda912b0833f..da30d85c9236 100644
--- a/drivers/isdn/hardware/mISDN/Kconfig
+++ b/drivers/isdn/hardware/mISDN/Kconfig
@@ -78,11 +78,14 @@ config MISDN_NETJET
depends on PCI
depends on TTY
select MISDN_IPAC
- select ISDN_HDLC
- select ISDN_I4L
+ select MISDN_HDLC
help
Enable support for Traverse Technologies NETJet PCI cards.
+config MISDN_HDLC
+ tristate
+ select CRC_CCITT
+ select BITREVERSE
config MISDN_IPAC
tristate
diff --git a/drivers/isdn/hardware/mISDN/Makefile
b/drivers/isdn/hardware/mISDN/Makefile
index 422f9fd8ab9a..3f50f8c4753f 100644
--- a/drivers/isdn/hardware/mISDN/Makefile
+++ b/drivers/isdn/hardware/mISDN/Makefile
@@ -15,3 +15,5 @@ obj-$(CONFIG_MISDN_NETJET) += netjet.o
# chip modules
obj-$(CONFIG_MISDN_IPAC) += mISDNipac.o
obj-$(CONFIG_MISDN_ISAR) += mISDNisar.o
+
+obj-$(CONFIG_MISDN_HDLC) += isdnhdlc.o
diff --git a/drivers/isdn/i4l/isdnhdlc.c
b/drivers/isdn/hardware/mISDN/isdnhdlc.c
similarity index 99%
rename from drivers/isdn/i4l/isdnhdlc.c
rename to drivers/isdn/hardware/mISDN/isdnhdlc.c
index 027d1c590679..3a8b562e63b1 100644
--- a/drivers/isdn/i4l/isdnhdlc.c
+++ b/drivers/isdn/hardware/mISDN/isdnhdlc.c
@@ -25,8 +25,8 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/crc-ccitt.h>
-#include <linux/isdn/hdlc.h>
#include <linux/bitrev.h>
+#include "isdnhdlc.h"
/*-------------------------------------------------------------------*/
diff --git a/include/linux/isdn/hdlc.h b/drivers/isdn/hardware/mISDN/isdnhdlc.h
similarity index 100%
rename from include/linux/isdn/hdlc.h
rename to drivers/isdn/hardware/mISDN/isdnhdlc.h
diff --git a/drivers/isdn/hardware/mISDN/netjet.c
b/drivers/isdn/hardware/mISDN/netjet.c
index 2b317cb63d06..93a2d361eda5 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -29,7 +29,7 @@
#include "ipac.h"
#include "iohelper.h"
#include "netjet.h"
-#include <linux/isdn/hdlc.h>
+#include "isdnhdlc.h"
#define NETJET_REV "2.0"
diff --git a/drivers/isdn/i4l/Makefile b/drivers/isdn/i4l/Makefile
deleted file mode 100644
index 11fe697739d5..000000000000
--
2.20.0
