summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/board-evm.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-03 21:28:46 +0400
committerIngo Molnar <mingo@elte.hu>2008-10-03 21:28:46 +0400
commitf68ec0c24755e5cdb779be6240925f2175311d84 (patch)
treea7b7128e61a8456385d82bd1c7ca5f14eecbf2ca /arch/arm/mach-davinci/board-evm.c
parent98920dc3d1113b883cbc73e3293446d3525c6042 (diff)
parent94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff)
downloadlinux-f68ec0c24755e5cdb779be6240925f2175311d84.tar.xz
Merge commit 'v2.6.27-rc8' into x86/setup
Diffstat (limited to 'arch/arm/mach-davinci/board-evm.c')
-rw-r--r--arch/arm/mach-davinci/board-evm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/board-evm.c b/arch/arm/mach-davinci/board-evm.c
index 9e4024c4965f..134355787814 100644
--- a/arch/arm/mach-davinci/board-evm.c
+++ b/arch/arm/mach-davinci/board-evm.c
@@ -20,13 +20,13 @@
#include <asm/setup.h>
#include <asm/io.h>
#include <asm/mach-types.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/flash.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
/* other misc. init functions */
void __init davinci_psc_init(void);