[RFC: 2.6 patch] fix ISDN_CAPI<->ISDN_DIVAS

[Adrian Bunk]

Randy Dunlap reported in kernel Bugzilla #8241 the following compile 
error with CONFIG_ISDN_CAPI=m, CONFIG_ISDN_DIVAS=y:

<--  snip  -->

...
WARNING: "DIVA_DIDD_Read" [drivers/isdn/hardware/eicon/divacapi.ko] undefined!
WARNING: "DIVA_DIDD_Read" [drivers/isdn/hardware/eicon/diva_mnt.ko] undefined!
WARNING: "DIVA_DIDD_Read" [drivers/isdn/hardware/eicon/diva_idi.ko] undefined!
WARNING: "proc_net_eicon" [drivers/isdn/hardware/eicon/diva_idi.ko] undefined!
make[1]: *** [__modpost] Error 1

<--  snip  -->


Kconfig contains the following strange thing:

menu "Active Eicon DIVA Server cards"
        depends on NET && ISDN && ISDN_CAPI!=n


It seems that except for ISDN_DIVAS_DIVACAPI (that already has a proper 
dependency), nothing here actually requires ISDN_CAPI?


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

 drivers/isdn/Makefile               |    2 +-
 drivers/isdn/hardware/eicon/Kconfig |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.21-rc4-mm1/drivers/isdn/hardware/eicon/Kconfig.old	2007-03-23 21:30:30.000000000 +0100
+++ linux-2.6.21-rc4-mm1/drivers/isdn/hardware/eicon/Kconfig	2007-03-23 21:26:09.000000000 +0100
@@ -3,7 +3,7 @@
 #
 
 menu "Active Eicon DIVA Server cards"
-	depends on NET && ISDN && ISDN_CAPI!=n
+	depends on NET && ISDN
 
 config CAPI_EICON
 	bool "Support Eicon cards"
--- linux-2.6.21-rc4-mm1/drivers/isdn/Makefile.old	2007-03-23 21:27:19.000000000 +0100
+++ linux-2.6.21-rc4-mm1/drivers/isdn/Makefile	2007-03-23 21:27:38.000000000 +0100
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_ISDN_I4L)			+= i4l/
 obj-$(CONFIG_ISDN_CAPI)			+= capi/
-obj-$(CONFIG_ISDN_CAPI)			+= hardware/
+obj-$(CONFIG_ISDN)			+= hardware/
 obj-$(CONFIG_ISDN_DIVERSION)		+= divert/
 obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax/
 obj-$(CONFIG_ISDN_DRV_ICN)		+= icn/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/