diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /include/asm-um/futex.h | |
| parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
| parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
Pull release into acpica branch
Diffstat (limited to 'include/asm-um/futex.h')
| -rw-r--r-- | include/asm-um/futex.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/asm-um/futex.h b/include/asm-um/futex.h index 142ee2d8e0fd..6a332a9f099c 100644 --- a/include/asm-um/futex.h +++ b/include/asm-um/futex.h | |||
| @@ -1,12 +1,6 @@ | |||
| 1 | #ifndef __UM_FUTEX_H | 1 | #ifndef _ASM_FUTEX_H |
| 2 | #define __UM_FUTEX_H | 2 | #define _ASM_FUTEX_H |
| 3 | 3 | ||
| 4 | #include <linux/futex.h> | 4 | #include <asm-generic/futex.h> |
| 5 | #include <asm/errno.h> | ||
| 6 | #include <asm/system.h> | ||
| 7 | #include <asm/processor.h> | ||
| 8 | #include <asm/uaccess.h> | ||
| 9 | |||
| 10 | #include "asm/arch/futex.h" | ||
| 11 | 5 | ||
| 12 | #endif | 6 | #endif |