Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
-index 565d6ef..c978d62 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
-@@ -154,6 +154,19 @@ config USB_OHCI_HCD_PCI
+@@ -154,6 +154,19 @@
Enables support for PCI-bus plug-in USB controller cards.
If unsure, say Y.
config USB_OHCI_BIG_ENDIAN_DESC
bool
depends on USB_OHCI_HCD
-diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
-index f7c6ced..240c7f5 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
-@@ -1033,11 +1033,17 @@ MODULE_LICENSE ("GPL");
+@@ -926,11 +926,17 @@
#define PS3_SYSTEM_BUS_DRIVER ps3_ohci_driver
#endif
#error "missing bus glue for ohci-hcd"
#endif
-@@ -1082,10 +1088,20 @@ static int __init ohci_hcd_mod_init(void)
+@@ -975,10 +981,20 @@
goto error_pci;
#endif
error_pci:
#endif
#ifdef SA1111_DRIVER
-@@ -1110,6 +1126,9 @@ module_init(ohci_hcd_mod_init);
+@@ -1003,6 +1019,9 @@
static void __exit ohci_hcd_mod_exit(void)
{
#ifdef PCI_DRIVER
pci_unregister_driver(&PCI_DRIVER);
#endif
-diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
-new file mode 100644
-index 0000000..bc3e785
--- /dev/null
+++ b/drivers/usb/host/ohci-ssb.c
@@ -0,0 +1,247 @@
+ .suspend = ssb_ohci_suspend,
+ .resume = ssb_ohci_resume,
+};
-