diff options
| author | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
| commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
| tree | b1ce838a37044bb38dfc128e2116ca35630e629a /arch/cris/arch-v32 | |
| parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Diffstat (limited to 'arch/cris/arch-v32')
| -rw-r--r-- | arch/cris/arch-v32/kernel/head.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S index 3db478eb5155..76266f80a5f1 100644 --- a/arch/cris/arch-v32/kernel/head.S +++ b/arch/cris/arch-v32/kernel/head.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * The macros found in mmu_defs_asm.h uses the ## concatenation operator, so | 10 | * The macros found in mmu_defs_asm.h uses the ## concatenation operator, so |
| 11 | * -traditional must not be used when assembling this file. | 11 | * -traditional must not be used when assembling this file. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/autoconf.h> | ||
| 14 | #include <arch/memmap.h> | 13 | #include <arch/memmap.h> |
| 15 | #include <hwregs/reg_rdwr.h> | 14 | #include <hwregs/reg_rdwr.h> |
| 16 | #include <hwregs/intr_vect.h> | 15 | #include <hwregs/intr_vect.h> |