aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-05-29 16:56:15 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-05-29 16:56:15 +0000
commitc2ee19355b908623ac8f07a9cbb43ef8427af254 (patch)
tree0d6eadf777543fe5db581e9fd1b2139ecf576b66 /target/linux
parent7128e381c998bcc0d20f5a686af9b94bd1ceb9a5 (diff)
downloadupstream-c2ee19355b908623ac8f07a9cbb43ef8427af254.tar.gz
upstream-c2ee19355b908623ac8f07a9cbb43ef8427af254.tar.bz2
upstream-c2ee19355b908623ac8f07a9cbb43ef8427af254.zip
.21 fixes
SVN-Revision: 7387
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c1
-rw-r--r--target/linux/adm5120-2.6/files/drivers/serial/adm5120_uart.c2
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;