diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 09:16:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 09:16:56 -0700 |
| commit | 5a439c565799cb8d290d71ce375e86be64d43a4b (patch) | |
| tree | b7933dced01add02249af35f5497e77cd11dbfdf /include/asm-xtensa/rwsem.h | |
| parent | 94b6da5ab8293b04a300ba35c72eddfa94db8b02 (diff) | |
| parent | 0025427eee4b5c005b4ac7a6489adc773e38611d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: Add config files for Diamond 232L - Rev B processor variant
xtensa: Fix io regions
xtensa: Add support for the Sonic Ethernet device for the XT2000 board.
xtensa: replace remaining __FUNCTION__ occurrences
xtensa: use newer __SPIN_LOCK_UNLOCKED macro
XTENSA: warn about including <asm/rwsem.h> directly.
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 0aad3a58755..e39edf5c86f 100644 --- a/include/asm-xtensa/rwsem.h +++ b/include/asm-xtensa/rwsem.h @@ -13,6 +13,10 @@ #ifndef _XTENSA_RWSEM_H #define _XTENSA_RWSEM_H +#ifndef _LINUX_RWSEM_H +#error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead." +#endif + #include <linux/list.h> #include <linux/spinlock.h> #include <asm/atomic.h> |