.21 fixes

SVN-Revision: 7387
17 years ago · c2ee19355b
parent 7128e381c9
commit c2ee19355b
2 changed files with 2 additions and 1 deletions
--- 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
--- 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;