aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
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
commite9688455f60944b73ed69d435569c62b2670ac08 (patch)
tree7cfb04a54015dd34cab0306bfa2a450f42f815f1 /target/linux/ramips
parentaa81b9ed5ff5f016bc6fcefd110ee524d9dc98fd (diff)
downloadupstream-e9688455f60944b73ed69d435569c62b2670ac08.tar.gz
upstream-e9688455f60944b73ed69d435569c62b2670ac08.tar.bz2
upstream-e9688455f60944b73ed69d435569c62b2670ac08.zip
kernel: update 3.10 to 3.10.3
Also refresh 3.10 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37546
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/Makefile2
-rw-r--r--target/linux/ramips/patches-3.10/0026-i2c-MIPS-adds-ralink-I2C-driver.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index bb3f4f1392..d918b951c4 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 mt7620a
CFLAGS:=-Os -pipe -fno-caller-saves -mno-branch-likely
FEATURES:=squashfs gpio
-LINUX_VERSION:=3.10.2
+LINUX_VERSION:=3.10.3
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\
diff --git a/target/linux/ramips/patches-3.10/0026-i2c-MIPS-adds-ralink-I2C-driver.patch b/target/linux/ramips/patches-3.10/0026-i2c-MIPS-adds-ralink-I2C-driver.patch
index 0e72ef02c7..aae4b18a7c 100644
--- a/target/linux/ramips/patches-3.10/0026-i2c-MIPS-adds-ralink-I2C-driver.patch
+++ b/target/linux/ramips/patches-3.10/0026-i2c-MIPS-adds-ralink-I2C-driver.patch
@@ -45,7 +45,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+};
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
-@@ -628,6 +628,10 @@ config I2C_PXA_SLAVE
+@@ -629,6 +629,10 @@ config I2C_PXA_SLAVE
is necessary for systems where the PXA may be a target on the
I2C bus.