X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fserial%2Fsamsung.c;h=5b964d4bc04dd54aee6af9dc091fae6817d6c5ba;hb=a1b81a84fff05dbfef45b7012c26e1fee9973e5d;hp=4a3ecaa629e6c90773c420a3a3a7d599fe10978d;hpb=fca515fbfa5ecd9f7b54db311317e2c877d7831a;p=linux-2.6

diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index 4a3ecaa629..5b964d4bc0 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -45,7 +45,7 @@
 
 #include <asm/irq.h>
 
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 
 #include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
@@ -202,7 +202,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
 {
 	struct s3c24xx_uart_port *ourport = dev_id;
 	struct uart_port *port = &ourport->port;
-	struct tty_struct *tty = port->info->tty;
+	struct tty_struct *tty = port->info->port.tty;
 	unsigned int ufcon, ch, flag, ufstat, uerstat;
 	int max_count = 64;