Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[mv-sheeva.git] / drivers / amba / bus.c

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 6b94fb7be5f280bbe2a8e5c0ddace6355cae0185..00c46e0b40e47eec54b2710f06cbe59d7308905f 100644 (file)
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -12,9 +12,10 @@
 #include <linux/device.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 #include <linux/amba/bus.h>
 
-#include <asm/io.h>
+#include <asm/irq.h>
 #include <asm/sizes.h>
 
 #define to_amba_device(d)      container_of(d, struct amba_device, dev)