Merge branches 'fixes' and 'misc' into for-next

[deliverable/linux.git] / arch / arm / mach-ixp4xx / omixp-setup.c

diff --git a/arch/arm/mach-ixp4xx/omixp-setup.c b/arch/arm/mach-ixp4xx/omixp-setup.c
index 46a89f5e82693f930c318abb0ce61f976b324b9b..75ef03dc996490893c70c23ceea874b42747a679 100644 (file)
--- a/arch/arm/mach-ixp4xx/omixp-setup.c
+++ b/arch/arm/mach-ixp4xx/omixp-setup.c
@@ -27,6 +27,8 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 
+#include <mach/hardware.h>
+
 static struct resource omixp_flash_resources[] = {
        {
                .flags  = IORESOURCE_MEM,