summaryrefslogtreecommitdiff
path: root/arch/arm/mach-lh7a40x/arch-kev7a400.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-19 05:34:07 +0400
committerIngo Molnar <mingo@elte.hu>2008-08-19 05:34:07 +0400
commit2879a927bb7a3cf91ae3906a5e59215f9c17dd75 (patch)
tree870bdd1bd530a3d5d2abd10539700446b2878188 /arch/arm/mach-lh7a40x/arch-kev7a400.c
parent7e7b43892b87b6be259479ef4de14029dcb4012f (diff)
parent20211e4d344729f4d4c93da37a590fc1c3a1fd9b (diff)
downloadlinux-2879a927bb7a3cf91ae3906a5e59215f9c17dd75.tar.xz
Merge branch 'x86/oprofile' into oprofile
Diffstat (limited to 'arch/arm/mach-lh7a40x/arch-kev7a400.c')
-rw-r--r--arch/arm/mach-lh7a40x/arch-kev7a400.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c
index 2ef7d0097b38..551b97261826 100644
--- a/arch/arm/mach-lh7a40x/arch-kev7a400.c
+++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c
@@ -13,7 +13,7 @@
#include <linux/device.h>
#include <linux/interrupt.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>