]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/serial/pxa.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[linux-2.6-omap-h63xx.git] / drivers / serial / pxa.c
index b9a93f326fb8d1a57aba71dddd732fbdccff007e..f7a0d37c42219678bf1d7c8d64bb79deced586ab 100644 (file)
@@ -45,9 +45,9 @@
 #include <linux/clk.h>
 
 #include <asm/io.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 
 struct uart_pxa_port {