ISDN: Make isdnhdlc usable for other ISDN drivers

isdnhdlc is useful for other ISDN drivers as well.
Move the include file to a central location and the source
to the central isdn location.

Signed-off-by: Karsten Keil <keil@b1-systems.de>

diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index 02bdca6f95c332aacf4c4be6578c7511b93e8ab8..022a194529535a6f08a1c66ac19dd4d5afabcafa 100644 (file)
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -21,8 +21,6 @@ menuconfig ISDN
 
 if ISDN
 
-source "drivers/isdn/mISDN/Kconfig"
-
 menuconfig ISDN_I4L
        tristate "Old ISDN4Linux (deprecated)"
        ---help---
@@ -41,9 +39,9 @@ menuconfig ISDN_I4L
          It is still available, though, for use with adapters that are not
          supported by the new CAPI subsystem yet.
 
-if ISDN_I4L
+source "drivers/isdn/mISDN/Kconfig"
+
 source "drivers/isdn/i4l/Kconfig"
-endif
 
 menuconfig ISDN_CAPI
        tristate "CAPI 2.0 subsystem"

diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 7832d8ba8e444d9ae47a1af89b15f1756f7e8632..3464ebc4cdbc63af6bb89b53e98cd0b5f72c5b68 100644 (file)
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -391,6 +391,7 @@ comment "HiSax sub driver modules"
 config HISAX_ST5481
        tristate "ST5481 USB ISDN modem (EXPERIMENTAL)"
        depends on USB && EXPERIMENTAL
+       select ISDN_HDLC
        select CRC_CCITT
        select BITREVERSE
        help
@@ -418,11 +419,6 @@ config HISAX_FRITZ_PCIPNP
          (the latter also needs you to select "ISA Plug and Play support"
          from the menu "Plug and Play configuration")
 
-config HISAX_HDLC
-       bool
-       depends on HISAX_ST5481
-       default y
-
 config HISAX_AVM_A1_PCMCIA
        bool
        depends on HISAX_AVM_A1_CS

diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile
index c7a3794bdae47c8d65ca003676d290a4524a1c04..ab638b083df9cfffb79071b7a313a5c2663eab4b 100644 (file)
--- a/drivers/isdn/hisax/Makefile
+++ b/drivers/isdn/hisax/Makefile
@@ -16,10 +16,6 @@ obj-$(CONFIG_HISAX_HFCUSB)           += hfc_usb.o
 obj-$(CONFIG_HISAX_HFC4S8S)            += hfc4s8s_l1.o
 obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_isac.o hisax_fcpcipnp.o
 
-ifdef CONFIG_HISAX_HDLC
-obj-$(CONFIG_ISDN_DRV_HISAX)           += isdnhdlc.o
-endif
-
 # Multipart objects.
 
 hisax_st5481-y                                 := st5481_init.o st5481_usb.o st5481_d.o \

diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h
index cff7a6354334234ca9f2030229bf5e49b08de432..64f78a8c28c5969d41a7eaecce923b198335a080 100644 (file)
--- a/drivers/isdn/hisax/st5481.h
+++ b/drivers/isdn/hisax/st5481.h
@@ -226,7 +226,7 @@ printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 #define INFO(format, arg...) \
 printk(KERN_INFO "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 
-#include "isdnhdlc.h"
+#include <linux/isdn/hdlc.h>
 #include "fsm.h"
 #include "hisax_if.h"
 #include <linux/skbuff.h>

diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig
index ed3510f273d82b616c328c6f59367a9d262de6b7..dd744ffd240bcd34251174902ebcacfb112f0931 100644 (file)
--- a/drivers/isdn/i4l/Kconfig
+++ b/drivers/isdn/i4l/Kconfig
@@ -2,6 +2,8 @@
 # Old ISDN4Linux config
 #
 
+if ISDN_I4L
+
 config ISDN_PPP
        bool "Support synchronous PPP"
        depends on INET
@@ -135,3 +137,12 @@ source "drivers/isdn/act2000/Kconfig"
 source "drivers/isdn/hysdn/Kconfig"
 
 endmenu
+# end ISDN_I4L
+endif
+
+config ISDN_HDLC
+       tristate 
+       depends on HISAX_ST5481
+       select CRC_CCITT
+       select BITREVERSE
+

diff --git a/drivers/isdn/i4l/Makefile b/drivers/isdn/i4l/Makefile
index 49a06c0005dd6aae7edb27f3a7b03e55fc27392f..cb9d3bb9fae0a97926b6e9b13ff4483f1eb8739f 100644 (file)
--- a/drivers/isdn/i4l/Makefile
+++ b/drivers/isdn/i4l/Makefile
@@ -4,6 +4,7 @@
 
 obj-$(CONFIG_ISDN_I4L)         += isdn.o
 obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o
+obj-$(CONFIG_ISDN_HDLC)                += isdnhdlc.o
 
 # Multipart objects.
 

diff --git a/drivers/isdn/hisax/isdnhdlc.c b/drivers/isdn/i4l/isdnhdlc.c
similarity index 99%
rename from drivers/isdn/hisax/isdnhdlc.c
rename to drivers/isdn/i4l/isdnhdlc.c
index c69a77a80062f970bc289c543a9eded80e35aa73..44ec7418496bd4f955347c2878eff490bd917f3f 100644 (file)
--- a/drivers/isdn/hisax/isdnhdlc.c
+++ b/drivers/isdn/i4l/isdnhdlc.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/crc-ccitt.h>
-#include "isdnhdlc.h"
+#include <linux/isdn/hdlc.h>
 
 /*-------------------------------------------------------------------*/
 

diff --git a/drivers/isdn/hisax/isdnhdlc.h b/include/linux/isdn/hdlc.h
similarity index 100%
rename from drivers/isdn/hisax/isdnhdlc.h
rename to include/linux/isdn/hdlc.h