aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-05-08 08:53:55 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-05-08 08:53:55 +0000
commit39467e78e76dcdfa6dc3430b4b52d4333a97135f (patch)
tree9e626dd1e77086483f0c6f4887c82009064732bf /target/linux
parente57c7d6c12f3d05e44a1b76e430b298a8a79f77e (diff)
downloadupstream-39467e78e76dcdfa6dc3430b4b52d4333a97135f.tar.gz
upstream-39467e78e76dcdfa6dc3430b4b52d4333a97135f.tar.bz2
upstream-39467e78e76dcdfa6dc3430b4b52d4333a97135f.zip
kernel: update linux 3.9 to 3.9.1
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 36577
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/gemini/Makefile2
-rw-r--r--target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch2
-rw-r--r--target/linux/generic/patches-3.9/863-gpiommc.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile
index 78eb3f7f6c..41f50c85f2 100644
--- a/target/linux/gemini/Makefile
+++ b/target/linux/gemini/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs pci
CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.9-rc4
+LINUX_VERSION:=3.9.1
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch b/target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch
index 7b3f71ce4f..e3900861f1 100644
--- a/target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch
+++ b/target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch
@@ -545,7 +545,7 @@
up_write(&ehci_cf_port_reset_rwsem);
ehci->last_periodic_enable = ktime_get_real();
-@@ -1241,6 +1254,11 @@ MODULE_DESCRIPTION(DRIVER_DESC);
+@@ -1238,6 +1251,11 @@ MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR (DRIVER_AUTHOR);
MODULE_LICENSE ("GPL");
diff --git a/target/linux/generic/patches-3.9/863-gpiommc.patch b/target/linux/generic/patches-3.9/863-gpiommc.patch
index ebbafb45aa..d431ad3154 100644
--- a/target/linux/generic/patches-3.9/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.9/863-gpiommc.patch
@@ -612,7 +612,7 @@
+module_exit(gpiommc_modexit);
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
-@@ -473,6 +473,31 @@ config MMC_SDHI
+@@ -463,6 +463,31 @@ config MMC_SDHI
This provides support for the SDHI SD/SDIO controller found in
SuperH and ARM SH-Mobile SoCs