[PATCH] eicon ISDN driver: Kernelconfig

Main divas modules now may be build in-kernel.
4BRI cards are configured together with BRI cards.

drivers/isdn/hardware/eicon/Kconfig

@@ -12,7 +12,7 @@ config CAPI_EICON
 
 config ISDN_DIVAS
 	tristate "Support Eicon DIVA Server cards"
-	depends on CAPI_EICON && PROC_FS && PCI && m
+	depends on CAPI_EICON && PROC_FS && PCI
 	help
 	  Say Y here if you have an Eicon Networks DIVA Server PCI ISDN card.
 	  In order to use this card, additional firmware is necessary, which
@@ -24,12 +24,6 @@ config ISDN_DIVAS_BRIPCI
 	help
 	  Enable support for DIVA Server BRI-PCI.
 
-config ISDN_DIVAS_4BRIPCI
-	bool "DIVA Server 4BRI/PCI support"
-	depends on ISDN_DIVAS
-	help
-	  Enable support for DIVA Server 4BRI-PCI.
-
 config ISDN_DIVAS_PRIPCI
 	bool "DIVA Server PRI/PCI support"
 	depends on ISDN_DIVAS
@@ -43,17 +37,17 @@ config ISDN_DIVAS_DIVACAPI
 	  You need this to provide the CAPI interface
 	  for DIVA Server cards.
 
-config ISDN_DIVAS_MAINT
-	tristate "DIVA Maint driver support"
-	depends on ISDN_DIVAS
-	help
-	  Enable Divas Maintainance driver.
-
 config ISDN_DIVAS_USERIDI
 	tristate "DIVA User-IDI interface support"
 	depends on ISDN_DIVAS
 	help
 	  Enable support for user-mode IDI interface.
 
+config ISDN_DIVAS_MAINT
+	tristate "DIVA Maint driver support"
+	depends on ISDN_DIVAS && m
+	help
+	  Enable Divas Maintainance driver.
+
 endmenu
 

drivers/isdn/hardware/eicon/Makefile

@@ -10,9 +10,8 @@ obj-$(CONFIG_ISDN_DIVAS_DIVACAPI)	+= divacapi.o
 # Multipart objects. 
 
 divas-y					:= divasmain.o divasfunc.o di.o io.o istream.o \
-					   diva.o dlist.o divasproc.o diva_dma.o
-divas-$(CONFIG_ISDN_DIVAS_BRIPCI)	+= os_bri.o  s_bri.o
-divas-$(CONFIG_ISDN_DIVAS_4BRIPCI)	+= os_4bri.o s_4bri.o
+					   diva.o divasproc.o diva_dma.o
+divas-$(CONFIG_ISDN_DIVAS_BRIPCI)	+= os_bri.o  s_bri.o os_4bri.o s_4bri.o
 divas-$(CONFIG_ISDN_DIVAS_PRIPCI)	+= os_pri.o  s_pri.o
 
 divacapi-y				:= capimain.o capifunc.o message.o capidtmf.o
@@ -21,4 +20,4 @@ divadidd-y				:= diva_didd.o diddfunc.o dadapter.o
 
 diva_mnt-y				:= divamnt.o mntfunc.o debug.o maintidi.o
 
-diva_idi-y				:= divasi.o idifunc.o um_idi.o dqueue.o dlist.o
+diva_idi-y				:= divasi.o idifunc.o um_idi.o dqueue.o