summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuinn Jensen <quinn.jensen@freescale.com>2007-10-24 21:24:23 -0600
committerQuinn Jensen <quinn.jensen@freescale.com>2007-10-24 21:24:23 -0600
commit41648536a83ece1d6afbed36d6371123eef2d3fe (patch)
tree3c8748465a850889934a05604feb423b7f8e398b
parent0cf639b866c7a6767365d261736fdf50dadef2b7 (diff)
USB: cleanup Kconfig options some more.
Patch to fix Bugzilla 745, 746, 747. USB: Clean up more Kconfig options. Applies to linux 2.6.22 kernel for MX platforms. http://www.bitshrine.org/gpp/linux-2.6.22-mx-USB-cleanup-Kconfig-options-some-more.patch
-rw-r--r--drivers/usb/gadget/Kconfig4
-rw-r--r--drivers/usb/host/Kconfig4
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 146d073e811f..9625a5abfff9 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -270,8 +270,8 @@ endchoice
config USB_OTG
boolean "OTG Support"
depends on (USB_GADGET_OMAP && ARCH_OMAP_OTG && USB_OHCI_HCD) || \
- ((USB_GADGET_ARC && (ARCH_MX3 || ARCH_MX27) && \
- (USB_GADGET_FSL_MC13783 || USB_GADGET_FSL_1504) && USB_EHCI_HCD))
+ (USB_GADGET_ARC && (ARCH_MX3 || ARCH_MX27) && USB_GADGET_FSL_1504 && \
+ USB_EHCI_HCD)
help
The most notable feature of USB OTG is support for a
"Dual-Role" device, which can act as either a device
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 76cc997ed560..c8988b1247da 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -47,7 +47,9 @@ config USB_EHCI_ARC_H1
config USB_EHCI_ARC_H2
bool "Support for Host2 port on Freescale controller"
- depends on USB_EHCI_ARC && (ARCH_MX27 || ARCH_MX3)
+ depends on USB_EHCI_ARC && \
+ ((ARCH_MX27 && !SPI_MXC_SELECT1 && !SPI_MXC_SELECT2) || \
+ ARCH_MX3)
---help---
Enable support for the USB Host2 port.