USB: buildfix ppc randconfig

We could just make the USB_OHCI_HCD_PPC_OF option implicit
and selected only if at least one of USB_OHCI_HCD_PPC_OF_BE
and USB_OHCI_HCD_PPC_OF_LE are set.

[ dbrownell@users.sourceforge.net: fix patch manglation and dependencies ]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Subrata Modak <subrata@linux.vnet.ibm.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 15 insertions, 14 deletions

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 0c03471f0d41..1a920c70b5a1 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -181,26 +181,27 @@ config USB_OHCI_HCD_PPC_SOC
           Enables support for the USB controller on the MPC52xx or
           STB03xxx processor chip.  If unsure, say Y.
 
-config USB_OHCI_HCD_PPC_OF
-        bool "OHCI support for PPC USB controller on OF platform bus"
-        depends on USB_OHCI_HCD && PPC_OF
-        default y
-        ---help---
-          Enables support for the USB controller PowerPC present on the
-          OpenFirmware platform bus.
-
 config USB_OHCI_HCD_PPC_OF_BE
-        bool "Support big endian HC"
-        depends on USB_OHCI_HCD_PPC_OF
-        default y
+        bool "OHCI support for OF platform bus (big endian)"
+        depends on USB_OHCI_HCD && PPC_OF
         select USB_OHCI_BIG_ENDIAN_DESC
         select USB_OHCI_BIG_ENDIAN_MMIO
+        ---help---
+          Enables support for big-endian USB controllers present on the
+          OpenFirmware platform bus.
 
 config USB_OHCI_HCD_PPC_OF_LE
-        bool "Support little endian HC"
-        depends on USB_OHCI_HCD_PPC_OF
-        default n
+        bool "OHCI support for OF platform bus (little endian)"
+        depends on USB_OHCI_HCD && PPC_OF
         select USB_OHCI_LITTLE_ENDIAN
+        ---help---
+          Enables support for little-endian USB controllers present on the
+          OpenFirmware platform bus.
+
+config USB_OHCI_HCD_PPC_OF
+        bool
+        depends on USB_OHCI_HCD && PPC_OF
+        default USB_OHCI_HCD_PPC_OF_BE || USB_OHCI_HCD_PPC_OF_LE
 
 config USB_OHCI_HCD_PCI
         bool "OHCI support for PCI-bus USB controllers"