tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Karsten Keil cb3824ba 74d15418

+17 -15
+2 -4
drivers/isdn/Kconfig
··· 21 21 22 22 if ISDN 23 23 24 - source "drivers/isdn/mISDN/Kconfig" 25 - 26 24 menuconfig ISDN_I4L 27 25 tristate "Old ISDN4Linux (deprecated)" 28 26 ---help--- ··· 39 41 It is still available, though, for use with adapters that are not 40 42 supported by the new CAPI subsystem yet. 41 43 42 - if ISDN_I4L 44 + source "drivers/isdn/mISDN/Kconfig" 45 + 43 46 source "drivers/isdn/i4l/Kconfig" 44 - endif 45 47 46 48 menuconfig ISDN_CAPI 47 49 tristate "CAPI 2.0 subsystem"
+1 -5
drivers/isdn/hisax/Kconfig
··· 391 391 config HISAX_ST5481 392 392 tristate "ST5481 USB ISDN modem (EXPERIMENTAL)" 393 393 depends on USB && EXPERIMENTAL 394 + select ISDN_HDLC 394 395 select CRC_CCITT 395 396 select BITREVERSE 396 397 help ··· 418 417 Fritz!Card PCI v2 and Fritz!Card PnP. 419 418 (the latter also needs you to select "ISA Plug and Play support" 420 419 from the menu "Plug and Play configuration") 421 - 422 - config HISAX_HDLC 423 - bool 424 - depends on HISAX_ST5481 425 - default y 426 420 427 421 config HISAX_AVM_A1_PCMCIA 428 422 bool
-4
drivers/isdn/hisax/Makefile
··· 16 16 obj-$(CONFIG_HISAX_HFC4S8S) += hfc4s8s_l1.o 17 17 obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o 18 18 19 - ifdef CONFIG_HISAX_HDLC 20 - obj-$(CONFIG_ISDN_DRV_HISAX) += isdnhdlc.o 21 - endif 22 - 23 19 # Multipart objects. 24 20 25 21 hisax_st5481-y := st5481_init.o st5481_usb.o st5481_d.o \
+1 -1
drivers/isdn/hisax/isdnhdlc.c drivers/isdn/i4l/isdnhdlc.c
··· 23 23 #include <linux/module.h> 24 24 #include <linux/init.h> 25 25 #include <linux/crc-ccitt.h> 26 - #include "isdnhdlc.h" 26 + #include <linux/isdn/hdlc.h> 27 27 28 28 /*-------------------------------------------------------------------*/ 29 29
drivers/isdn/hisax/isdnhdlc.h include/linux/isdn/hdlc.h
+1 -1
drivers/isdn/hisax/st5481.h
··· 226 226 #define INFO(format, arg...) \ 227 227 printk(KERN_INFO "%s:%s: " format "\n" , __FILE__, __func__ , ## arg) 228 228 229 - #include "isdnhdlc.h" 229 + #include <linux/isdn/hdlc.h> 230 230 #include "fsm.h" 231 231 #include "hisax_if.h" 232 232 #include <linux/skbuff.h>
+11
drivers/isdn/i4l/Kconfig
··· 2 2 # Old ISDN4Linux config 3 3 # 4 4 5 + if ISDN_I4L 6 + 5 7 config ISDN_PPP 6 8 bool "Support synchronous PPP" 7 9 depends on INET ··· 137 135 source "drivers/isdn/hysdn/Kconfig" 138 136 139 137 endmenu 138 + # end ISDN_I4L 139 + endif 140 + 141 + config ISDN_HDLC 142 + tristate 143 + depends on HISAX_ST5481 144 + select CRC_CCITT 145 + select BITREVERSE 146 +
+1
drivers/isdn/i4l/Makefile
··· 4 4 5 5 obj-$(CONFIG_ISDN_I4L) += isdn.o 6 6 obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o 7 + obj-$(CONFIG_ISDN_HDLC) += isdnhdlc.o 7 8 8 9 # Multipart objects. 9 10