diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-29 16:56:15 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-29 16:56:15 +0000 |
| commit | 60e97b82f7ee8c0c0b7e8a28136bc4a5b9cd6238 (patch) | |
| tree | dc3964a4d645cf51bc89312669457df545d50d53 | |
| parent | 6c5121c214fe1a011b6ecabe22dc1372021eda44 (diff) | |
.21 fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7387 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c | 1 | ||||
| -rw-r--r-- | target/linux/adm5120-2.6/files/drivers/serial/adm5120_uart.c | 2 |
2 files changed, 2 insertions, 1 deletions
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 a1737d702..41c290b04 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 6b4292867..ea1010cca 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; |