Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

[linux-2.6-omap-h63xx.git] / drivers / usb / host / Kconfig

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index cf10cbc98f8089885ab3174ceb09e56c369aa543..62711870f8ee1fd5dbb8d974ad3b2a74466c7ea5 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -67,6 +67,11 @@ config USB_EHCI_TT_NEWSCHED
 
          If unsure, say N.
 
+config USB_EHCI_BIG_ENDIAN_MMIO
+       bool
+       depends on USB_EHCI_HCD
+       default n
+
 config USB_ISP116X_HCD
        tristate "ISP116X HCD support"
        depends on USB
@@ -101,21 +106,48 @@ config USB_OHCI_HCD_PPC_SOC
        bool "OHCI support for on-chip PPC USB controller"
        depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
        default y
-       select USB_OHCI_BIG_ENDIAN
+       select USB_OHCI_BIG_ENDIAN_DESC
+       select USB_OHCI_BIG_ENDIAN_MMIO
        ---help---
          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
+       select USB_OHCI_BIG_ENDIAN_DESC
+       select USB_OHCI_BIG_ENDIAN_MMIO
+
+config USB_OHCI_HCD_PPC_OF_LE
+       bool "Support little endian HC"
+       depends on USB_OHCI_HCD_PPC_OF
+       default n
+       select USB_OHCI_LITTLE_ENDIAN
+
 config USB_OHCI_HCD_PCI
        bool "OHCI support for PCI-bus USB controllers"
-       depends on USB_OHCI_HCD && PCI && (STB03xxx || PPC_MPC52xx)
+       depends on USB_OHCI_HCD && PCI && (STB03xxx || PPC_MPC52xx || USB_OHCI_HCD_PPC_OF)
        default y
        select USB_OHCI_LITTLE_ENDIAN
        ---help---
          Enables support for PCI-bus plug-in USB controller cards.
          If unsure, say Y.
 
-config USB_OHCI_BIG_ENDIAN
+config USB_OHCI_BIG_ENDIAN_DESC
+       bool
+       depends on USB_OHCI_HCD
+       default n
+
+config USB_OHCI_BIG_ENDIAN_MMIO
        bool
        depends on USB_OHCI_HCD
        default n
@@ -153,7 +185,7 @@ config USB_U132_HCD
          adapter will *NOT* work with PC cards that do not contain an OHCI
          controller.
 
-         For those PC cards that contain multiple OHCI controllers only ther
+         For those PC cards that contain multiple OHCI controllers only the
          first one is used.
 
          The driver consists of two modules, the "ftdi-elan" module is a