aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-07-26 07:19:58 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-07-26 07:19:58 +0000
commit0a80570a9c0d3ee0ca223e50ce149b1944393f7b (patch)
treed5cedec9dca6d08d75cd6f3e716c72a67e9d75cf /target/linux/brcm2708
parent0ec41bc74eaedc98a8324bbfa006389e2b8ca22b (diff)
downloadupstream-0a80570a9c0d3ee0ca223e50ce149b1944393f7b.tar.gz
upstream-0a80570a9c0d3ee0ca223e50ce149b1944393f7b.tar.bz2
upstream-0a80570a9c0d3ee0ca223e50ce149b1944393f7b.zip
kernel: update 3.10 to 3.10.3
Also refresh 3.10 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37546 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708')
-rw-r--r--target/linux/brcm2708/Makefile2
-rw-r--r--target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile
index 6e4111103b..7a36ca3213 100644
--- a/target/linux/brcm2708/Makefile
+++ b/target/linux/brcm2708/Makefile
@@ -13,7 +13,7 @@ BOARDNAME:=Broadcom BCM2708/BCM2835
FEATURES:=ext4 audio usb usbgadget display gpio
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.10.2
+LINUX_VERSION:=3.10.3
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835
diff --git a/target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch b/target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch
index 82388b7a46..026af8a7d9 100644
--- a/target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch
+++ b/target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch
@@ -411,7 +411,7 @@
+MODULE_ALIAS("platform:" DRV_NAME);
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
-@@ -343,6 +343,25 @@ config I2C_BCM2835
+@@ -344,6 +344,25 @@ config I2C_BCM2835
This support is also available as a module. If so, the module
will be called i2c-bcm2835.