.21 fixes
authorFlorian Fainelli <florian@openwrt.org>
Tue, 29 May 2007 16:56:15 +0000 (16:56 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Tue, 29 May 2007 16:56:15 +0000 (16:56 +0000)
SVN-Revision: 7387

target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
target/linux/adm5120-2.6/files/drivers/serial/adm5120_uart.c

index a1737d7020df5761b2e794e0bafe2a9ddc891b15..41c290b04a6c03542ec5853b9c0b12a0498bcc1f 100644 (file)
@@ -43,6 +43,7 @@
 #include <linux/wait.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
+#include <linux/sched.h>
 #ifdef CONFIG_MTD_PARTITIONS
 #include <linux/mtd/partitions.h>
 #endif
index 6b429286793451e2cdd0e9ffb35d48670fc0187f..ea1010cca146fdf90764b101ef73cb5e8b634aeb 100644 (file)
@@ -308,7 +308,7 @@ static void adm5120ser_shutdown(struct uart_port *port)
 }
 
 static void adm5120ser_set_termios(struct uart_port *port,
-    struct termios *termios, struct termios *old)
+    struct ktermios *termios, struct ktermios *old)
 {
        unsigned int baud, quot, lcrh;
        unsigned long flags;