diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/ohci-omap.c | 3 | ||||
-rw-r--r-- | drivers/usb/host/ohci-pci.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 1 | ||||
-rw-r--r-- | drivers/usb/input/pid.c | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 45efeed1fcc3..49815ec4b842 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
@@ -14,6 +14,9 @@ | |||
14 | * This file is licenced under the GPL. | 14 | * This file is licenced under the GPL. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/signal.h> /* SA_INTERRUPT */ | ||
18 | #include <linux/jiffies.h> | ||
19 | |||
17 | #include <asm/hardware.h> | 20 | #include <asm/hardware.h> |
18 | #include <asm/io.h> | 21 | #include <asm/io.h> |
19 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index bf1d5ab4aa3a..7ce1d9ef0289 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
@@ -14,6 +14,8 @@ | |||
14 | * This file is licenced under the GPL. | 14 | * This file is licenced under the GPL. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/jiffies.h> | ||
18 | |||
17 | #ifdef CONFIG_PPC_PMAC | 19 | #ifdef CONFIG_PPC_PMAC |
18 | #include <asm/machdep.h> | 20 | #include <asm/machdep.h> |
19 | #include <asm/pmac_feature.h> | 21 | #include <asm/pmac_feature.h> |
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index d287dcccd415..f4a4aeda40b7 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
@@ -20,6 +20,7 @@ | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/device.h> | 22 | #include <linux/device.h> |
23 | #include <linux/signal.h> | ||
23 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
24 | #include <asm/hardware.h> | 25 | #include <asm/hardware.h> |
25 | #include <asm/arch/pxa-regs.h> | 26 | #include <asm/arch/pxa-regs.h> |
diff --git a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c index a00672c96644..dca5ee93a4ef 100644 --- a/drivers/usb/input/pid.c +++ b/drivers/usb/input/pid.c | |||
@@ -198,7 +198,7 @@ static int hid_pid_upload_effect(struct input_dev *dev, | |||
198 | } | 198 | } |
199 | 199 | ||
200 | effect->id = id; | 200 | effect->id = id; |
201 | dev_dbg(&pid_private->hid->dev->dev, "effect ID is %d\n.", id); | 201 | dev_dbg(&pid_private->hid->dev->dev, "effect ID is %d.\n", id); |
202 | pid_private->effects[id].owner = current->pid; | 202 | pid_private->effects[id].owner = current->pid; |
203 | pid_private->effects[id].flags = (1 << FF_PID_FLAGS_USED); | 203 | pid_private->effects[id].flags = (1 << FF_PID_FLAGS_USED); |
204 | spin_unlock_irqrestore(&pid_private->lock, flags); | 204 | spin_unlock_irqrestore(&pid_private->lock, flags); |