git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
usb
/
host
/
ohci-omap.c
diff --git
a/drivers/usb/host/ohci-omap.c
b/drivers/usb/host/ohci-omap.c
index
eba974d
..
1e5fc5d
100644
(file)
--- a/
drivers/usb/host/ohci-omap.c
+++ b/
drivers/usb/host/ohci-omap.c
@@
-17,7
+17,6
@@
*/
#include <asm/hardware.h>
*/
#include <asm/hardware.h>
-#include <asm/mach-types.h>
#include <asm/io.h>
#include <asm/arch/bus.h>
#include <asm/io.h>
#include <asm/arch/bus.h>
@@
-454,7
+453,6
@@
int usb_hcd_omap_probe (const struct hc_driver *driver,
*/
void usb_hcd_omap_remove (struct usb_hcd *hcd, struct omap_dev *dev)
{
*/
void usb_hcd_omap_remove (struct usb_hcd *hcd, struct omap_dev *dev)
{
- struct usb_device *hub;
void *base;
info ("remove: %s, state %x", hcd->self.bus_name, hcd->state);
void *base;
info ("remove: %s, state %x", hcd->self.bus_name, hcd->state);
@@
-462,11
+460,10
@@
void usb_hcd_omap_remove (struct usb_hcd *hcd, struct omap_dev *dev)
if (in_interrupt ())
BUG ();
if (in_interrupt ())
BUG ();
- hub = hcd->self.root_hub;
hcd->state = USB_STATE_QUIESCING;
dbg ("%s: roothub graceful disconnect", hcd->self.bus_name);
hcd->state = USB_STATE_QUIESCING;
dbg ("%s: roothub graceful disconnect", hcd->self.bus_name);
- usb_disconnect (&hub);
+ usb_disconnect (&h
cd->self.root_h
ub);
hcd->driver->stop (hcd);
hcd_buffer_destroy (hcd);
hcd->driver->stop (hcd);
hcd_buffer_destroy (hcd);
@@
-565,6
+562,10
@@
static const struct hc_driver ohci_omap_hc_driver = {
*/
.hub_status_data = ohci_hub_status_data,
.hub_control = ohci_hub_control,
*/
.hub_status_data = ohci_hub_status_data,
.hub_control = ohci_hub_control,
+#ifdef CONFIG_USB_SUSPEND
+ .hub_suspend = ohci_hub_suspend,
+ .hub_resume = ohci_hub_resume,
+#endif
};
/*-------------------------------------------------------------------------*/
};
/*-------------------------------------------------------------------------*/