diff options
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/include/asm/Kbuild | 4 | ||||
-rw-r--r-- | arch/cris/include/asm/bitops.h | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/cputime.h | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index f3fd8768f095..afff5105909d 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild | |||
@@ -5,12 +5,14 @@ header-y += arch-v32/ | |||
5 | 5 | ||
6 | generic-y += barrier.h | 6 | generic-y += barrier.h |
7 | generic-y += clkdev.h | 7 | generic-y += clkdev.h |
8 | generic-y += cputime.h | ||
8 | generic-y += exec.h | 9 | generic-y += exec.h |
9 | generic-y += hash.h | 10 | generic-y += hash.h |
10 | generic-y += kvm_para.h | 11 | generic-y += kvm_para.h |
11 | generic-y += linkage.h | 12 | generic-y += linkage.h |
13 | generic-y += mcs_spinlock.h | ||
12 | generic-y += module.h | 14 | generic-y += module.h |
15 | generic-y += preempt.h | ||
13 | generic-y += trace_clock.h | 16 | generic-y += trace_clock.h |
14 | generic-y += vga.h | 17 | generic-y += vga.h |
15 | generic-y += xor.h | 18 | generic-y += xor.h |
16 | generic-y += preempt.h | ||
diff --git a/arch/cris/include/asm/bitops.h b/arch/cris/include/asm/bitops.h index 184066ceb1f6..053c17b36559 100644 --- a/arch/cris/include/asm/bitops.h +++ b/arch/cris/include/asm/bitops.h | |||
@@ -144,7 +144,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) | |||
144 | * definition, which doesn't have the same semantics. We don't want to | 144 | * definition, which doesn't have the same semantics. We don't want to |
145 | * use -fno-builtin, so just hide the name ffs. | 145 | * use -fno-builtin, so just hide the name ffs. |
146 | */ | 146 | */ |
147 | #define ffs kernel_ffs | 147 | #define ffs(x) kernel_ffs(x) |
148 | 148 | ||
149 | #include <asm-generic/bitops/fls.h> | 149 | #include <asm-generic/bitops/fls.h> |
150 | #include <asm-generic/bitops/__fls.h> | 150 | #include <asm-generic/bitops/__fls.h> |
diff --git a/arch/cris/include/asm/cputime.h b/arch/cris/include/asm/cputime.h deleted file mode 100644 index 4446a65656fa..000000000000 --- a/arch/cris/include/asm/cputime.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __CRIS_CPUTIME_H | ||
2 | #define __CRIS_CPUTIME_H | ||
3 | |||
4 | #include <asm-generic/cputime.h> | ||
5 | |||
6 | #endif /* __CRIS_CPUTIME_H */ | ||