diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-13 16:57:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-13 16:57:17 +1100 |
| commit | c06ab71e9852d00150f82a26bcdfa5657911a9c5 (patch) | |
| tree | a186847292d74610f5f07035837877b39b1fa5fb /include/linux/syscalls.h | |
| parent | 26a9fe3d937ea501f9c0c100a1b0f159551fd963 (diff) | |
| parent | 6fcc0ef3af13bcdb603250755b916e423ce4b065 (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/base/core.c
drivers/firewire/fw-device.c
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 4c2577bd1c85..8df6d1382ac8 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -60,7 +60,6 @@ struct getcpu_cache; #include <linux/capability.h> #include <linux/list.h> #include <linux/sem.h> -#include <asm/semaphore.h> #include <asm/siginfo.h> #include <asm/signal.h> #include <linux/quota.h> |