projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
[cascardo/linux.git]
/
include
/
asm-m32r
/
bitops.h
diff --git
a/include/asm-m32r/bitops.h
b/include/asm-m32r/bitops.h
index
66ab672
..
6dc9b81
100644
(file)
--- a/
include/asm-m32r/bitops.h
+++ b/
include/asm-m32r/bitops.h
@@
-11,6
+11,10
@@
* Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org>
*/
* Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org>
*/
+#ifndef _LINUX_BITOPS_H
+#error only <linux/bitops.h> can be included directly
+#endif
+
#include <linux/compiler.h>
#include <asm/assembler.h>
#include <asm/system.h>
#include <linux/compiler.h>
#include <asm/assembler.h>
#include <asm/system.h>
@@
-255,6
+259,7
@@
static __inline__ int test_and_change_bit(int nr, volatile void * addr)
#include <asm-generic/bitops/find.h>
#include <asm-generic/bitops/ffs.h>
#include <asm-generic/bitops/hweight.h>
#include <asm-generic/bitops/find.h>
#include <asm-generic/bitops/ffs.h>
#include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */