aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/at91sam9rl.c
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2008-08-14 10:55:26 +0200
committerIngo Molnar <[email protected]>2008-08-14 10:55:26 +0200
commitd4439087d316613548c70472291bf4ca646ce24b (patch)
tree4819f39cbbfcc2ed9c9f85c7a91cbf142f5b02d4 /arch/arm/mach-at91/at91sam9rl.c
parent26d809af6397ce5c37f5c44d89734d19cce1ad25 (diff)
parent30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff)
Merge commit 'v2.6.27-rc3' into x86/xsave
Conflicts: arch/x86/kernel/genapic_64.c include/asm-x86/kvm_host.h Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9rl.c')
-rw-r--r--arch/arm/mach-at91/at91sam9rl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
index 902c79893ec7..556bddf35b45 100644
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@ -14,11 +14,11 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/at91sam9rl.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_shdwc.h>
+#include <mach/cpu.h>
+#include <mach/at91sam9rl.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_shdwc.h>
#include "generic.h"
#include "clock.h"