summaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-24 17:08:37 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-24 17:08:37 +0000
commite21bd57719923eb5c96b54f9a487f41a0ef8a384 (patch)
treec26f13fa9668d846cf53e47e54020d4a73031b44 /target/linux/ramips
parent8b8cde72a47f02a1347b983303c87f9176b7470a (diff)
kernel: update linux 3.7 to 3.7.4
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35318 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/Makefile2
-rw-r--r--target/linux/ramips/patches-3.7/101-rt288x_serial_driver_hack.patch8
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index 82d20b6a8..346eca63c 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
FEATURES:=squashfs
-LINUX_VERSION:=3.7.3
+LINUX_VERSION:=3.7.4
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\
diff --git a/target/linux/ramips/patches-3.7/101-rt288x_serial_driver_hack.patch b/target/linux/ramips/patches-3.7/101-rt288x_serial_driver_hack.patch
index 8bc33272f..4269e86ac 100644
--- a/target/linux/ramips/patches-3.7/101-rt288x_serial_driver_hack.patch
+++ b/target/linux/ramips/patches-3.7/101-rt288x_serial_driver_hack.patch
@@ -28,7 +28,7 @@
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
-@@ -308,9 +308,9 @@ static void default_serial_dl_write(stru
+@@ -314,9 +314,9 @@ static void default_serial_dl_write(stru
serial_out(up, UART_DLM, value >> 8 & 0xff);
}
@@ -40,7 +40,7 @@
static const u8 au_io_in_map[] = {
[UART_RX] = 0,
[UART_IER] = 2,
-@@ -489,7 +489,7 @@ static void set_io_from_upio(struct uart
+@@ -495,7 +495,7 @@ static void set_io_from_upio(struct uart
break;
#endif
@@ -49,7 +49,7 @@
case UPIO_AU:
p->serial_in = au_serial_in;
p->serial_out = au_serial_out;
-@@ -701,22 +701,19 @@ static int size_fifo(struct uart_8250_po
+@@ -707,22 +707,19 @@ static int size_fifo(struct uart_8250_po
*/
static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p)
{
@@ -78,7 +78,7 @@
serial_out(p, UART_LCR, old_lcr);
return id;
-@@ -842,7 +839,7 @@ static int broken_efr(struct uart_8250_p
+@@ -848,7 +845,7 @@ static int broken_efr(struct uart_8250_p
/*
* Exar ST16C2550 "A2" devices incorrectly detect as
* having an EFR, and report an ID of 0x0201. See