Commit cb3824ba authored by Karsten Keil's avatar Karsten Keil
Browse files

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: default avatarKarsten Keil <keil@b1-systems.de>
parent 74d15418

drivers/isdn/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -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"

drivers/isdn/hisax/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -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

drivers/isdn/hisax/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -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 \

drivers/isdn/hisax/st5481.h

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/isdn/i4l/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -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