UWB Kconfig: cannot set UWB to N in gconfig

Commit Message

richard kennedy Sept. 11, 2009, 2 p.m. UTC

On Thu, 2009-09-10 at 09:08 -0700, Randy Dunlap wrote:
> On Thu, 10 Sep 2009 11:05:54 +0100 Richard Kennedy wrote:
> 
> > I sometimes use 'make gconfig' and I noticed that I cannot disable the
> > UWB option -- it just won't let me set it to N.
> 
> Not specific to 'gconfig'.
> 
> > AFAICT this is because the CONFIG USB_WUSB selects UWB which forces it
> > on.
> 
> Yes.
> 
> > applying this patch fixes the issue but I'm not sure if this is the
> > right way to go about it.
> > 
> > any thoughts?
> 
> UWB can be disabled by disabling both of these options that are several
> entries below it in the same menu:
> 
> USB_WHCI_HCD and USB_HWA_HCD
> 
> and then returning to UWB and disabling it.
> 
> Should users have to figure that out?  no.
> 
thanks,
although it's not easy to figure out how to disable this in gconfig.
USB_WHCI_HCD & USB_HWA_HCD end up under a different menu
(drivers/usb/host). 
If you don't know that they exist, all you see is the options under UWB
set to M and gconfig doesn't let you turn them off.  

Here's another version of the patch that changes them all to 'depends
on'. This lets gconfig do the right thing :)

regards
Richard




--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 1a920c7..5b6924b 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -347,8 +347,8 @@  config USB_WHCI_HCD
 	tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
 	depends on PCI && USB
-	select USB_WUSB
-	select UWB_WHCI
+	depends on  USB_WUSB
+	depends on UWB_WHCI
 	help
 	  A driver for PCI-based Wireless USB Host Controllers that are
 	  compliant with the WHCI specification.
@@ -360,8 +360,8 @@  config USB_HWA_HCD
 	tristate "Host Wire Adapter (HWA) driver (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
 	depends on USB
-	select USB_WUSB
-	select UWB_HWA
+	depends on USB_WUSB
+	depends on UWB_HWA
 	help
 	  This driver enables you to connect Wireless USB devices to
 	  your system using a Host Wire Adaptor USB dongle. This is an
diff --git a/drivers/usb/wusbcore/Kconfig b/drivers/usb/wusbcore/Kconfig
index eb09a0a..8209da9 100644
--- a/drivers/usb/wusbcore/Kconfig
+++ b/drivers/usb/wusbcore/Kconfig
@@ -5,7 +5,7 @@  config USB_WUSB
 	tristate "Enable Wireless USB extensions (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
 	depends on USB
-        select UWB
+	depends on UWB
         select CRYPTO
         select CRYPTO_BLKCIPHER
         select CRYPTO_CBC