diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 10:55:16 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 10:55:16 +0200 |
| commit | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (patch) | |
| tree | 3d053e76542ad4d20bd83ad35c13eabff97003ab /arch/avr32/boards/atstk1000/setup.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff) | |
| parent | avr32: Use <mach/foo.h> instead of <asm/arch/foo.h> (diff) | |
| download | linux-a1b81a84fff05dbfef45b7012c26e1fee9973e5d.tar.xz linux-a1b81a84fff05dbfef45b7012c26e1fee9973e5d.zip | |
Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'arch/avr32/boards/atstk1000/setup.c')
| -rw-r--r-- | arch/avr32/boards/atstk1000/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/boards/atstk1000/setup.c b/arch/avr32/boards/atstk1000/setup.c index 8bedf93876a3..2d6b560115d9 100644 --- a/arch/avr32/boards/atstk1000/setup.c +++ b/arch/avr32/boards/atstk1000/setup.c @@ -18,9 +18,9 @@ #include <asm/setup.h> -#include <asm/arch/at32ap700x.h> -#include <asm/arch/board.h> -#include <asm/arch/portmux.h> +#include <mach/at32ap700x.h> +#include <mach/board.h> +#include <mach/portmux.h> #include "atstk1000.h" |