Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / arch / arm / oprofile / op_model_mpcore.c

diff --git a/arch/arm/oprofile/op_model_mpcore.c b/arch/arm/oprofile/op_model_mpcore.c
index 4458705021e0f547008fab7668d8567dec8a3a12..92db6e035c65ddaa1731a0f51ba1a39d10064b0e 100644 (file)
--- a/arch/arm/oprofile/op_model_mpcore.c
+++ b/arch/arm/oprofile/op_model_mpcore.c
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/system.h>
 
 #include "op_counter.h"