diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-23 03:48:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-23 03:48:41 -0500 |
| commit | 26e20a108caca6231c6a5ec659f815a866904751 (patch) | |
| tree | 36932c208a9e8994bfd7ed4eaf48b9c33f71fbe3 /drivers/net/wireless/orinoco/orinoco_usb.c | |
| parent | 691513f70d3957939a318da970987b876c720861 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into x86/security
Diffstat (limited to 'drivers/net/wireless/orinoco/orinoco_usb.c')
| -rw-r--r-- | drivers/net/wireless/orinoco/orinoco_usb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index a38a7bd25f19..b9aedf18a046 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c | |||
| @@ -57,7 +57,6 @@ | |||
| 57 | #include <linux/fcntl.h> | 57 | #include <linux/fcntl.h> |
| 58 | #include <linux/spinlock.h> | 58 | #include <linux/spinlock.h> |
| 59 | #include <linux/list.h> | 59 | #include <linux/list.h> |
| 60 | #include <linux/smp_lock.h> | ||
| 61 | #include <linux/usb.h> | 60 | #include <linux/usb.h> |
| 62 | #include <linux/timer.h> | 61 | #include <linux/timer.h> |
| 63 | 62 | ||