diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /arch/m32r/include/asm/bitops.h | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'arch/m32r/include/asm/bitops.h')
| -rw-r--r-- | arch/m32r/include/asm/bitops.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m32r/include/asm/bitops.h b/arch/m32r/include/asm/bitops.h index aaddf0d57603..6300f22cdbdb 100644 --- a/arch/m32r/include/asm/bitops.h +++ b/arch/m32r/include/asm/bitops.h | |||
| @@ -266,9 +266,8 @@ static __inline__ int test_and_change_bit(int nr, volatile void * addr) | |||
| 266 | 266 | ||
| 267 | #ifdef __KERNEL__ | 267 | #ifdef __KERNEL__ |
| 268 | 268 | ||
| 269 | #include <asm-generic/bitops/ext2-non-atomic.h> | 269 | #include <asm-generic/bitops/le.h> |
| 270 | #include <asm-generic/bitops/ext2-atomic.h> | 270 | #include <asm-generic/bitops/ext2-atomic.h> |
| 271 | #include <asm-generic/bitops/minix.h> | ||
| 272 | 271 | ||
| 273 | #endif /* __KERNEL__ */ | 272 | #endif /* __KERNEL__ */ |
| 274 | 273 | ||