diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-05-29 16:56:15 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-05-29 16:56:15 +0000 |
| commit | 29579bec88e478904951cb567b967cd4417256b3 (patch) | |
| tree | dc3964a4d645cf51bc89312669457df545d50d53 /target | |
| parent | 3eb02ee774dc919d88ce7bdc9bf2e18b7d62be8c (diff) | |
| download | upstream-29579bec88e478904951cb567b967cd4417256b3.tar.gz upstream-29579bec88e478904951cb567b967cd4417256b3.tar.bz2 upstream-29579bec88e478904951cb567b967cd4417256b3.zip | |
.21 fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7387 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -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 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; |