aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
commite66a368bd1c068d50e24bd906cfc6ef7009f7580 (patch)
tree62821cf6f2450be73a617420cf7e4b46f2641232 /target/linux/ramips
parent797967480c2ec11fb788972de03cb35f076f95eb (diff)
downloadupstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.tar.gz
upstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.tar.bz2
upstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.zip
kernel: update to 2.6.32.10
SVN-Revision: 20444
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/Makefile2
-rw-r--r--target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch14
2 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index be1d122f5b..8eac4f6ef3 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
FEATURES:=squashfs broken
-LINUX_VERSION:=2.6.32.9
+LINUX_VERSION:=2.6.32.10
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=kmod-leds-gpio
diff --git a/target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch b/target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch
index 06d921f217..8e47aa3f10 100644
--- a/target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch
+++ b/target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch
@@ -1,6 +1,6 @@
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
-@@ -298,9 +298,9 @@ static const struct serial8250_config ua
+@@ -301,9 +301,9 @@ static const struct serial8250_config ua
},
};
@@ -12,7 +12,7 @@
static const u8 au_io_in_map[] = {
[UART_RX] = 0,
[UART_IER] = 2,
-@@ -418,7 +418,7 @@ static unsigned int mem32_serial_in(stru
+@@ -421,7 +421,7 @@ static unsigned int mem32_serial_in(stru
return readl(p->membase + offset);
}
@@ -21,7 +21,7 @@
static unsigned int au_serial_in(struct uart_port *p, int offset)
{
offset = map_8250_in_reg(p, offset) << p->regshift;
-@@ -499,7 +499,7 @@ static void set_io_from_upio(struct uart
+@@ -502,7 +502,7 @@ static void set_io_from_upio(struct uart
p->serial_out = mem32_serial_out;
break;
@@ -30,7 +30,7 @@
case UPIO_AU:
p->serial_in = au_serial_in;
p->serial_out = au_serial_out;
-@@ -531,7 +531,7 @@ serial_out_sync(struct uart_8250_port *u
+@@ -534,7 +534,7 @@ serial_out_sync(struct uart_8250_port *u
switch (p->iotype) {
case UPIO_MEM:
case UPIO_MEM32:
@@ -39,7 +39,7 @@
case UPIO_AU:
#endif
case UPIO_DWAPB:
-@@ -569,8 +569,8 @@ static inline void _serial_dl_write(stru
+@@ -572,8 +572,8 @@ static inline void _serial_dl_write(stru
serial_outp(up, UART_DLM, value >> 8 & 0xff);
}
@@ -50,7 +50,7 @@
static int serial_dl_read(struct uart_8250_port *up)
{
if (up->port.iotype == UPIO_AU)
-@@ -777,22 +777,19 @@ static int size_fifo(struct uart_8250_po
+@@ -780,22 +780,19 @@ static int size_fifo(struct uart_8250_po
*/
static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p)
{
@@ -79,7 +79,7 @@
serial_outp(p, UART_LCR, old_lcr);
return id;
-@@ -1214,7 +1211,7 @@ static void autoconfig(struct uart_8250_
+@@ -1217,7 +1214,7 @@ static void autoconfig(struct uart_8250_
}
#endif