diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:16 -0400 |
| commit | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (patch) | |
| tree | 3d053e76542ad4d20bd83ad35c13eabff97003ab /arch/avr32/kernel/setup.c | |
| parent | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (diff) | |
| parent | 3663b736a5083b3bce74520b637f630f01f66a7f (diff) | |
Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'arch/avr32/kernel/setup.c')
| -rw-r--r-- | arch/avr32/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c index ce48c14f4349..d8e623c426c1 100644 --- a/arch/avr32/kernel/setup.c +++ b/arch/avr32/kernel/setup.c | |||
| @@ -26,8 +26,8 @@ | |||
| 26 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
| 27 | #include <asm/sysreg.h> | 27 | #include <asm/sysreg.h> |
| 28 | 28 | ||
| 29 | #include <asm/arch/board.h> | 29 | #include <mach/board.h> |
| 30 | #include <asm/arch/init.h> | 30 | #include <mach/init.h> |
| 31 | 31 | ||
| 32 | extern int root_mountflags; | 32 | extern int root_mountflags; |
| 33 | 33 | ||