summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/board-picotux200.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-01-24 15:47:48 +0400
committerIngo Molnar <mingo@kernel.org>2013-01-24 15:47:48 +0400
commitbefddb21c845f8fb49e637997891ef97c6a869dc (patch)
tree0e7629123184f2dd50291ad6d477b894175f0f26 /arch/arm/mach-at91/board-picotux200.c
parente716efde75267eab919cdb2bef5b2cb77f305326 (diff)
parent7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff)
downloadlinux-befddb21c845f8fb49e637997891ef97c6a869dc.tar.xz
Merge tag 'v3.8-rc4' into irq/core
Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-at91/board-picotux200.c')
-rw-r--r--arch/arm/mach-at91/board-picotux200.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c
index f83e1de699e6..4938f1cd5e13 100644
--- a/arch/arm/mach-at91/board-picotux200.c
+++ b/arch/arm/mach-at91/board-picotux200.c
@@ -37,11 +37,11 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
-#include <mach/board.h>
-#include <mach/at91_aic.h>
#include <mach/at91rm9200_mc.h>
#include <mach/at91_ramc.h>
+#include "at91_aic.h"
+#include "board.h"
#include "generic.h"