2.6.25.y build fix added

diff --git a/queue-2.6.25/series b/queue-2.6.25/series
index 923d262d13cd62a2ffd2d9fb48640967cd71b3ff..bb6184cd5ed5d073d954ae7873ee9ec306730807 100644 (file)
--- a/queue-2.6.25/series
+++ b/queue-2.6.25/series
@@ -9,3 +9,4 @@ usb-add-telstra-nextg-cdma-id-to-option-driver.patch
 ext3-4-fix-uninitialized-bs-in-ext3-4_xattr_set_handle.patch
 libata-force-hardreset-if-link-is-in-powersave-mode.patch
 memory_hotplug-always-initialize-pageblock-bitmap.patch
+usb-fix-build-errors-in-ohci-omap.c-and-ohci-sm501.c.patch

diff --git a/queue-2.6.25/usb-fix-build-errors-in-ohci-omap.c-and-ohci-sm501.c.patch b/queue-2.6.25/usb-fix-build-errors-in-ohci-omap.c-and-ohci-sm501.c.patch
new file mode 100644 (file)
index 0000000..48441ed
--- /dev/null
+++ b/queue-2.6.25/usb-fix-build-errors-in-ohci-omap.c-and-ohci-sm501.c.patch
@@ -0,0 +1,47 @@
+From stable-bounces@linux.kernel.org Wed May 14 12:21:45 2008
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Date: Wed, 14 May 2008 19:21:22 GMT
+Subject: USB: fix build errors in ohci-omap.c and ohci-sm501.c
+To: greg@kroah.com
+
+From: Greg Kroah-Hartman <gregkh@suse.de>
+
+This fixes the build errors previously caused by
+45fa78357eab3287b5c39f2d983b91150b3f4bd8
+
+This makes the code mirror what went into Linus's tree previously.
+
+
+Reported-by: Randy Dunlap <rdunlap@xenotime.net>
+Cc: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/host/ohci-omap.c  |    3 ++-
+ drivers/usb/host/ohci-sm501.c |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/host/ohci-omap.c
++++ b/drivers/usb/host/ohci-omap.c
+@@ -511,7 +511,8 @@ static int ohci_omap_suspend(struct plat
+ 
+ static int ohci_omap_resume(struct platform_device *dev)
+ {
+-      struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(dev));
++      struct usb_hcd  *hcd = platform_get_drvdata(dev);
++      struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+ 
+       if (time_before(jiffies, ohci->next_statechange))
+               msleep(5);
+--- a/drivers/usb/host/ohci-sm501.c
++++ b/drivers/usb/host/ohci-sm501.c
+@@ -231,7 +231,8 @@ static int ohci_sm501_suspend(struct pla
+ static int ohci_sm501_resume(struct platform_device *pdev)
+ {
+       struct device *dev = &pdev->dev;
+-      struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(pdev));
++      struct usb_hcd  *hcd = platform_get_drvdata(pdev);
++      struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+ 
+       if (time_before(jiffies, ohci->next_statechange))
+               msleep(5);