summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2/pcm970-baseboard.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-13 13:08:47 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-13 13:08:47 +0200
commita12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch)
tree957c915298b299902aa80afa7c78e94c71b3dc25 /arch/arm/mach-mx2/pcm970-baseboard.c
parentx86: fix setup code crashes on my old 486 box (diff)
parentLinux 2.6.27-rc3 (diff)
downloadlinux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.xz
linux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.zip
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'arch/arm/mach-mx2/pcm970-baseboard.c')
-rw-r--r--arch/arm/mach-mx2/pcm970-baseboard.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-mx2/pcm970-baseboard.c
index 028ac4d33684..a560cd6ad23d 100644
--- a/arch/arm/mach-mx2/pcm970-baseboard.c
+++ b/arch/arm/mach-mx2/pcm970-baseboard.c
@@ -17,8 +17,7 @@
*/
#include <linux/platform_device.h>
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
+#include <mach/hardware.h>
#include <asm/mach/arch.h>
/*