Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / net / irda / omap-ir.c

diff --git a/drivers/net/irda/omap-ir.c b/drivers/net/irda/omap-ir.c
index 7e2f74e9160aafdd8a15bb7a15f93dc429fbbe43..b706253aae0ca7e2acb629e43ceb7f454b87fcf2 100644 (file)
--- a/drivers/net/irda/omap-ir.c
+++ b/drivers/net/irda/omap-ir.c
@@ -63,13 +63,13 @@
 
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/serial.h>
 #include <asm/mach-types.h>
 #include <asm/dma.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/irda.h>
+#include <mach/mux.h>
+#include <mach/gpio.h>
+#include <mach/irda.h>
 
 #define UART3_EFR_EN                   (1 << 4)
 #define UART3_MCR_EN_TCR_TLR           (1 << 6)