aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/malta
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-11-18 08:41:31 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-11-18 08:41:31 +0000
commitff1e854511069a17b447c39fb38643f17a74df82 (patch)
tree163616bcfaf9da78e15fab87c672f35cba7e11fa /target/linux/malta
parent8f7ea44df09618615e7c505cd776add25a6c5b3a (diff)
downloadupstream-ff1e854511069a17b447c39fb38643f17a74df82.tar.gz
upstream-ff1e854511069a17b447c39fb38643f17a74df82.tar.bz2
upstream-ff1e854511069a17b447c39fb38643f17a74df82.zip
kernel: update linux 3.6 to 3.6.7
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34227
Diffstat (limited to 'target/linux/malta')
-rw-r--r--target/linux/malta/Makefile2
-rw-r--r--target/linux/malta/patches-3.6/001-MIPS-fix-CBUS-UART-irq.patch7
-rw-r--r--target/linux/malta/patches-3.6/002-MIPS-Malta-fix-build-failure.patch5
3 files changed, 2 insertions, 12 deletions
diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile
index 8d2451f0d1..176f139a9a 100644
--- a/target/linux/malta/Makefile
+++ b/target/linux/malta/Makefile
@@ -13,7 +13,7 @@ SUBTARGETS:=le be
INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.6.6
+LINUX_VERSION:=3.6.7
DEVICE_TYPE:=developerboard
diff --git a/target/linux/malta/patches-3.6/001-MIPS-fix-CBUS-UART-irq.patch b/target/linux/malta/patches-3.6/001-MIPS-fix-CBUS-UART-irq.patch
index 93f93a79f2..347dcc0d1f 100644
--- a/target/linux/malta/patches-3.6/001-MIPS-fix-CBUS-UART-irq.patch
+++ b/target/linux/malta/patches-3.6/001-MIPS-fix-CBUS-UART-irq.patch
@@ -21,11 +21,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/mti-malta/malta-platform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c
-index a8beca8..a906153 100644
--- a/arch/mips/mti-malta/malta-platform.c
+++ b/arch/mips/mti-malta/malta-platform.c
-@@ -47,7 +47,7 @@ static struct plat_serial8250_port uart8250_data[] = {
+@@ -48,7 +48,7 @@ static struct plat_serial8250_port uart8
SMC_PORT(0x2F8, 3),
{
.mapbase = 0x1f000900, /* The CBUS UART */
@@ -34,6 +32,3 @@ index a8beca8..a906153 100644
.uartclk = 3686400, /* Twice the usual clk! */
.iotype = UPIO_MEM32,
.flags = CBUS_UART_FLAGS,
---
-1.7.11.7
-
diff --git a/target/linux/malta/patches-3.6/002-MIPS-Malta-fix-build-failure.patch b/target/linux/malta/patches-3.6/002-MIPS-Malta-fix-build-failure.patch
index f14cdb2d8e..636265239f 100644
--- a/target/linux/malta/patches-3.6/002-MIPS-Malta-fix-build-failure.patch
+++ b/target/linux/malta/patches-3.6/002-MIPS-Malta-fix-build-failure.patch
@@ -11,8 +11,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/mti-malta/malta-platform.c | 1 +
1 file changed, 1 insertion(+)
-diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c
-index c154181..7473217 100644
--- a/arch/mips/mti-malta/malta-platform.c
+++ b/arch/mips/mti-malta/malta-platform.c
@@ -29,6 +29,7 @@
@@ -23,6 +21,3 @@ index c154181..7473217 100644
#include <mtd/mtd-abi.h>
#define SMC_PORT(base, int) \
---
-1.7.11.7
-