diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-12 15:29:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-12 15:29:46 +1100 |
| commit | 7a6a5785a0f8e1f14563fe2ae8690c7ebf440e8e (patch) | |
| tree | a419c24556bb15e268805d72bb30f7bce1220735 /drivers/usb/core/hub.c | |
| parent | 4dd84d8b64ea9c4ab27ba9717f58b290a6d3c6ee (diff) | |
| parent | 6fcc0ef3af13bcdb603250755b916e423ce4b065 (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/firewire/fw-device.c
Diffstat (limited to 'drivers/usb/core/hub.c')
| -rw-r--r-- | drivers/usb/core/hub.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 5e8755431e07..ac07ea6efaf4 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -23,7 +23,6 @@ #include <linux/mutex.h> #include <linux/freezer.h> -#include <asm/semaphore.h> #include <asm/uaccess.h> #include <asm/byteorder.h> |