ISDN: Make raw-IP, CISCO HDLC, ... support optional

They'll still get compiled all into one module, but now you can choose
what you need - it's not hard to go from here to individual modules,
but most protocol-specific code is so small that it's probably not worth
it.

drivers/isdn/i4l/Config.in

@@ -3,6 +3,8 @@
 #
 
 if [ "$CONFIG_INET" != "n" ]; then
+   bool '  Support raw-IP and other simple protocols' CONFIG_ISDN_NET_SIMPLE
+   bool '  Support CISCO HDLC' CONFIG_ISDN_NET_CISCO
    bool '  Support synchronous PPP' CONFIG_ISDN_PPP
    if [ "$CONFIG_ISDN_PPP" != "n" ]; then
       bool         '    Use VJ-compression with synchronous PPP' CONFIG_ISDN_PPP_VJ

drivers/isdn/i4l/Makefile

@@ -11,14 +11,15 @@ obj-$(CONFIG_ISDN_PPP_BSDCOMP)		+= isdn_bsdcomp.o
 
 # Multipart objects.
 
-isdn-objs				:= isdn_net.o isdn_net_lib.o \
+isdn-objs				:= isdn_net_lib.o \
 					   isdn_fsm.o \
-					   isdn_ciscohdlck.o \
 					   isdn_tty.o isdn_v110.o \
 					   isdn_common.o \
 
 # Optional parts of multipart objects.
 
+isdn-objs-$(CONFIG_ISDN_NET_SIMPLE)	+= isdn_net.o
+isdn-objs-$(CONFIG_ISDN_NET_CISCO)	+= isdn_ciscohdlck.o
 isdn-objs-$(CONFIG_ISDN_PPP)		+= isdn_ppp.o isdn_ppp_ccp.o
 isdn-objs-$(CONFIG_ISDN_PPP_VJ)		+= isdn_ppp_vj.o
 isdn-objs-$(CONFIG_ISDN_MPP)		+= isdn_ppp_mp.o

drivers/isdn/i4l/isdn_net_lib.c

@@ -2338,12 +2338,16 @@ isdn_net_lib_init(void)
 {
 	fsm_new(&isdn_net_fsm);
 
+#ifdef CONFIG_ISDN_NET_SIMPLE
 	register_isdn_netif(ISDN_NET_ENCAP_ETHER,      &isdn_ether_ops);
 	register_isdn_netif(ISDN_NET_ENCAP_RAWIP,      &isdn_rawip_ops);
 	register_isdn_netif(ISDN_NET_ENCAP_IPTYP,      &isdn_iptyp_ops);
 	register_isdn_netif(ISDN_NET_ENCAP_UIHDLC,     &isdn_uihdlc_ops);
+#endif
+#ifdef CONFIG_ISDN_NET_CISCO
 	register_isdn_netif(ISDN_NET_ENCAP_CISCOHDLC,  &isdn_ciscohdlck_ops);
 	register_isdn_netif(ISDN_NET_ENCAP_CISCOHDLCK, &isdn_ciscohdlck_ops);
+#endif
 #ifdef CONFIG_ISDN_X25
 	register_isdn_netif(ISDN_NET_ENCAP_X25IFACE,   &isdn_x25_ops);
 #endif