From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 29 May 2007 16:56:15 +0000 (+0000)
Subject: .21 fixes
X-Git-Tag: reboot~29130
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c2ee19355b908623ac8f07a9cbb43ef8427af254;p=openwrt%2Fstaging%2Fchunkeey.git

.21 fixes

SVN-Revision: 7387
---

diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
index a1737d7020..41c290b04a 100644
--- a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
+++ b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
@@ -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
diff --git a/target/linux/adm5120-2.6/files/drivers/serial/adm5120_uart.c b/target/linux/adm5120-2.6/files/drivers/serial/adm5120_uart.c
index 6b42928679..ea1010cca1 100644
--- a/target/linux/adm5120-2.6/files/drivers/serial/adm5120_uart.c
+++ b/target/linux/adm5120-2.6/files/drivers/serial/adm5120_uart.c
@@ -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;