usb: ohci: sort out dependencies for lpc32xx and omap

The dependency on the isp1301 driver is not something that
should be in the main OHCI driver but rather the SoC specific
part of it.

This moves the dependency for LPC32xx into USB_OHCI_HCD_LPC32XX,
and changes the 'select ISP1301_OMAP' to a similar 'depends on'.
Since the same dependency exists for the client driver, do the
same change there.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: linux-omap@vger.kernel.org
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 363fc212c618..61b7817bd66b 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -363,8 +363,6 @@ config USB_MAX3421_HCD
 
 config USB_OHCI_HCD
         tristate "OHCI HCD (USB 1.1) support"
-        select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
-        depends on USB_ISP1301 || !ARCH_LPC32XX
         ---help---
           The Open Host Controller Interface (OHCI) is a standard for accessing
           USB 1.1 host controller hardware.  It does more in hardware than Intel's
@@ -383,6 +381,7 @@ if USB_OHCI_HCD
 config USB_OHCI_HCD_OMAP1
         tristate "OHCI support for OMAP1/2 chips"
         depends on ARCH_OMAP1
+        depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3)
         default y
         ---help---
           Enables support for the OHCI controller on OMAP1/2 chips.
@@ -406,6 +405,7 @@ config USB_OHCI_HCD_S3C2410
 config USB_OHCI_HCD_LPC32XX
         tristate "Support for LPC on-chip OHCI USB controller"
         depends on USB_OHCI_HCD && ARCH_LPC32XX
+        depends on USB_ISP1301
         default y
         ---help---
           Enables support for the on-chip OHCI controller on