Skip to contentSkip to conversation

isdn: fix netjet/isdnhdlc build errors

PATCH New Randy Dunlap 1 participant 1 message Sep 10, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 isdn: fix netjet/isdnhdlc build errors

From: Randy Dunlap <[email protected]>

The netjet driver uses isdnhdlc interfaces (as does another ISDN driver), so move that driver source file into the top-level drivers/isdn/ directory and make it available to any ISDN drivers.

Fixes these build errors:

ERROR: "isdnhdlc_decode" [drivers/isdn/hardware/mISDN/netjet.ko] undefined!
ERROR: "isdnhdlc_encode" [drivers/isdn/hardware/mISDN/netjet.ko] undefined!
ERROR: "isdnhdlc_out_init" [drivers/isdn/hardware/mISDN/netjet.ko] undefined!
ERROR: "isdnhdlc_rcv_init" [drivers/isdn/hardware/mISDN/netjet.ko] undefined!

---
 drivers/isdn/Kconfig        |    5 
 drivers/isdn/Makefile       |    2 
 drivers/isdn/i4l/Kconfig    |    6 
 drivers/isdn/i4l/Makefile   |    1 
 drivers/isdn/i4l/isdnhdlc.c |  630 ----------------------------------
 drivers/isdn/isdnhdlc.c     |  630 ++++++++++++++++++++++++++++++++++
 6 files changed, 637 insertions(+), 637 deletions(-)
drivers/isdn/Makefile +2 -0
@@ -15,3 +15,5 @@ obj-$(CONFIG_ISDN_DRV_LOOP)		+= isdnloop
 obj-$(CONFIG_ISDN_DRV_ACT2000)		+= act2000/
 obj-$(CONFIG_HYSDN)			+= hysdn/
 obj-$(CONFIG_ISDN_DRV_GIGASET)		+= gigaset/
+
+obj-$(CONFIG_ISDN_HDLC)		+= isdnhdlc.o
drivers/isdn/i4l/Makefile +0 -1
@@ -4,7 +4,6 @@
 
 obj-$(CONFIG_ISDN_I4L)		+= isdn.o
 obj-$(CONFIG_ISDN_PPP_BSDCOMP)	+= isdn_bsdcomp.o
-obj-$(CONFIG_ISDN_HDLC)		+= isdnhdlc.o
 
 # Multipart objects.
 
drivers/isdn/i4l/isdnhdlc.c deleted +0 -630

630 lines not on this page · raw message

drivers/isdn/isdnhdlc.c new file +630 -0

630 lines not on this page · raw message

drivers/isdn/Kconfig +5 -0
@@ -61,4 +61,9 @@ endif # ISDN_CAPI
 
 source "drivers/isdn/gigaset/Kconfig"
 
+config ISDN_HDLC
+	tristate
+	select CRC_CCITT
+	select BITREVERSE
+
 endif # ISDN
drivers/isdn/i4l/Kconfig +0 -6
@@ -140,9 +140,3 @@ endmenu
 # end ISDN_I4L
 endif
 
-config ISDN_HDLC
-	tristate 
-	depends on HISAX_ST5481
-	select CRC_CCITT
-	select BITREVERSE
-

---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/