Merge branch 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...

[~andy/linux] / drivers / usb / Kconfig

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 071b9675a7819dff38f5128c1d23f635f12b26a8..63436892688c04ca070d8e4574337d2babbedc80 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -6,6 +6,9 @@ menuconfig USB_SUPPORT
        bool "USB support"
        depends on HAS_IOMEM
        default y
+       ---help---
+         This option adds core support for Universal Serial Bus (USB).
+         You will also need drivers from the following menu to make use of it.
 
 if USB_SUPPORT
 
@@ -16,7 +19,7 @@ config USB_ARCH_HAS_HCD
        boolean
        default y if USB_ARCH_HAS_OHCI
        default y if USB_ARCH_HAS_EHCI
-       default y if PCMCIA                             # sl811_cs
+       default y if PCMCIA && !M32R                    # sl811_cs
        default y if ARM                                # SL-811
        default PCI