Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (70 commits)
  USB: remove duplicate device id from zc0301
  USB: remove duplicate device id from usb_storage
  USB: remove duplicate device id from keyspan
  USB: remove duplicate device id from ftdi_sio
  USB: remove duplicate device id from visor
  USB: a bit more coding style cleanup
  usbcore: trivial whitespace fixes
  usb-storage: use first bulk endpoints, not last
  EHCI: fix interrupt-driven remote wakeup
  USB: switch ehci-hcd to new polling scheme
  USB: autosuspend for usb printer driver
  USB Input: Added kernel module to support all GTCO CalComp USB InterWrite School products
  USB: Sierra Wireless auto set D0
  USB: usb ethernet gadget recognizes HUSB2DEV
  USB: list atmel husb2_udc gadget controller
  USB: gadgetfs AIO tweaks
  USB: gadgetfs behaves better on userspace init bug
  USB: gadgetfs race fix
  USB: gadgetfs simplifications
  USB: gadgetfs cleanups
  ...

1 files changed, 35 insertions, 3 deletions

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index cc60759083bf..62711870f8ee 100644
--- 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