X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fserial%2Fpxa.c;h=f7a0d37c42219678bf1d7c8d64bb79deced586ab;hb=e2205a156f4dd727097f7f492bf03aa8920b0071;hp=b4f7ffb7688d16b99facc3bd859042836bc66246;hpb=1e42198609d73ed1a9adcba2af275c24c2678420;p=linux-2.6

diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index b4f7ffb768..f7a0d37c42 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -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 {
@@ -101,7 +101,7 @@ static void serial_pxa_stop_rx(struct uart_port *port)
 
 static inline void receive_chars(struct uart_pxa_port *up, int *status)
 {
-	struct tty_struct *tty = up->port.info->tty;
+	struct tty_struct *tty = up->port.info->port.tty;
 	unsigned int ch, flag;
 	int max_count = 256;