diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/m32r/include/asm/bitops.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 | ||