diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /include/asm-x86/semaphore.h | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'include/asm-x86/semaphore.h')
| -rw-r--r-- | include/asm-x86/semaphore.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-x86/semaphore.h b/include/asm-x86/semaphore.h index 572c0b67a6b0..d9b2034ed1d2 100644 --- a/include/asm-x86/semaphore.h +++ b/include/asm-x86/semaphore.h | |||
| @@ -1,5 +1 @@ | |||
| 1 | #ifdef CONFIG_X86_32 | #include <linux/semaphore.h> | |
| 2 | # include "semaphore_32.h" | ||
| 3 | #else | ||
| 4 | # include "semaphore_64.h" | ||
| 5 | #endif | ||