X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fserial%2Fimx.c;h=6a29f9330a73c72d7799a83ce66a8ecd9a7e5588;hb=af7a535688a758d15f06a98833e6a143b29af9de;hp=64acb39a51ba0e939fd6c82810b7ac43450174b9;hpb=0c17e4ceedd35c78b1c7413dbd16279a350be6bc;p=linux-2.6

diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 64acb39a51..6a29f9330a 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -44,8 +44,8 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/hardware.h>
-#include <asm/arch/imx-uart.h>
+#include <mach/hardware.h>
+#include <mach/imx-uart.h>
 
 /* Register definitions */
 #define URXD0 0x0  /* Receiver Register */
@@ -372,7 +372,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
 {
 	struct imx_port *sport = dev_id;
 	unsigned int rx,flg,ignored = 0;
-	struct tty_struct *tty = sport->port.info->tty;
+	struct tty_struct *tty = sport->port.info->port.tty;
 	unsigned long flags, temp;
 
 	spin_lock_irqsave(&sport->port.lock,flags);