diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
| commit | 4944dd62de21230af039eda7cd218e9a09021d11 (patch) | |
| tree | bac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /include/asm-xtensa/rwsem.h | |
| parent | f17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'include/asm-xtensa/rwsem.h')
| -rw-r--r-- | include/asm-xtensa/rwsem.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-xtensa/rwsem.h b/include/asm-xtensa/rwsem.h index 0aad3a587551..e39edf5c86f2 100644 --- a/include/asm-xtensa/rwsem.h +++ b/include/asm-xtensa/rwsem.h | |||
| @@ -13,6 +13,10 @@ | |||
| 13 | #ifndef _XTENSA_RWSEM_H | 13 | #ifndef _XTENSA_RWSEM_H |
| 14 | #define _XTENSA_RWSEM_H | 14 | #define _XTENSA_RWSEM_H |
| 15 | 15 | ||
| 16 | #ifndef _LINUX_RWSEM_H | ||
| 17 | #error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead." | ||
| 18 | #endif | ||
| 19 | |||
| 16 | #include <linux/list.h> | 20 | #include <linux/list.h> |
| 17 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |
| 18 | #include <asm/atomic.h> | 22 | #include <asm/atomic.h> |