projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: Clean up duplicate includes in drivers/usb/
[cascardo/linux.git]
/
drivers
/
usb
/
host
/
u132-hcd.c
diff --git
a/drivers/usb/host/u132-hcd.c
b/drivers/usb/host/u132-hcd.c
index
7f765ec
..
598ad09
100644
(file)
--- a/
drivers/usb/host/u132-hcd.c
+++ b/
drivers/usb/host/u132-hcd.c
@@
-51,7
+51,6
@@
#include <linux/usb.h>
#include <linux/workqueue.h>
#include <linux/platform_device.h>
#include <linux/usb.h>
#include <linux/workqueue.h>
#include <linux/platform_device.h>
-#include <linux/pci_ids.h>
#include <linux/mutex.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <linux/mutex.h>
#include <asm/io.h>
#include <asm/irq.h>
@@
-1520,12
+1519,15
@@
static void u132_hcd_endp_work_scheduler(struct work_struct *work)
}
}
}
}
}
}
+#ifdef CONFIG_PM
static void port_power(struct u132 *u132, int pn, int is_on)
{
u132->port[pn].power = is_on;
}
static void port_power(struct u132 *u132, int pn, int is_on)
{
u132->port[pn].power = is_on;
}
+#endif
+
static void u132_power(struct u132 *u132, int is_on)
{
struct usb_hcd *hcd = u132_to_hcd(u132)
static void u132_power(struct u132 *u132, int is_on)
{
struct usb_hcd *hcd = u132_to_hcd(u132)