Merge branch 'fix/asoc' into for-linus

[mv-sheeva.git] / arch / arm / mach-sa1100 / leds-simpad.c

diff --git a/arch/arm/mach-sa1100/leds-simpad.c b/arch/arm/mach-sa1100/leds-simpad.c
index def090a87385c7915ea5ecd83658d5fd70d53f00..d50f4eeaa12ee5045282eca6d2b96cc18b59fa42 100644 (file)
--- a/arch/arm/mach-sa1100/leds-simpad.c
+++ b/arch/arm/mach-sa1100/leds-simpad.c
@@ -5,10 +5,10 @@
  */
 #include <linux/init.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
-#include <asm/arch/simpad.h>
+#include <mach/simpad.h>
 
 #include "leds.h"