aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-05-08 08:53:53 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-05-08 08:53:53 +0000
commite57c7d6c12f3d05e44a1b76e430b298a8a79f77e (patch)
tree6cefb4d8b7f2afb032fef47fb581bc9b893a33d8 /target/linux/brcm63xx
parentd09ba5ef10866458157e63ac5b6d3b128eda6724 (diff)
downloadupstream-e57c7d6c12f3d05e44a1b76e430b298a8a79f77e.tar.gz
upstream-e57c7d6c12f3d05e44a1b76e430b298a8a79f77e.tar.bz2
upstream-e57c7d6c12f3d05e44a1b76e430b298a8a79f77e.zip
kernel: update linux 3.8 to 3.8.12
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 36576
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/Makefile2
-rw-r--r--target/linux/brcm63xx/patches-3.8/415-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index 529cbeb9a8..a88882d28f 100644
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM63xx
SUBTARGETS:=generic smp
FEATURES:=squashfs jffs2 usb atm pci pcmcia
-LINUX_VERSION:=3.8.11
+LINUX_VERSION:=3.8.12
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/brcm63xx/patches-3.8/415-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch b/target/linux/brcm63xx/patches-3.8/415-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch
index 70026f1f5f..0b407c40b0 100644
--- a/target/linux/brcm63xx/patches-3.8/415-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch
+++ b/target/linux/brcm63xx/patches-3.8/415-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch
@@ -96,7 +96,7 @@ Subject: [PATCH 38/59] MIPS: BCM63XX: store the flash type in global variable
case BCM63XX_FLASH_TYPE_PARALLEL:
/* read base address of boot chip select (0) */
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-@@ -152,7 +165,7 @@ int __init bcm63xx_flash_register(void)
+@@ -154,7 +167,7 @@ int __init bcm63xx_flash_register(void)
return -ENODEV;
default:
pr_err("flash detection failed for BCM%x: %d\n",