diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 13:01:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 13:01:49 -0400 |
| commit | d848223808c5d21e1b3cea090047e34722c6254b (patch) | |
| tree | a869974378be9c20f311ad3d934eb3946e813a1a /arch/mn10300/kernel/setup.c | |
| parent | 5de4c51d2a859a1556b7d20ae1278c3e2d70a79b (diff) | |
| parent | 2f2a2132ff056bb45697dc855eb4fd95b70b38cb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
Separate out the proc- and unit-specific header directories from the general
Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
Diffstat (limited to 'arch/mn10300/kernel/setup.c')
| -rw-r--r-- | arch/mn10300/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index e1d88ab51008..71414e19fd16 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <asm/setup.h> | 30 | #include <asm/setup.h> |
| 31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
| 32 | #include <asm/smp.h> | 32 | #include <asm/smp.h> |
| 33 | #include <asm/proc/proc.h> | 33 | #include <proc/proc.h> |
| 34 | #include <asm/busctl-regs.h> | 34 | #include <asm/busctl-regs.h> |
| 35 | #include <asm/fpu.h> | 35 | #include <asm/fpu.h> |
| 36 | #include <asm/sections.h> | 36 | #include <asm/sections.h> |