aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-01-24 17:04:46 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-01-24 17:04:46 +0000
commit9781461a3dc0071a06bd70198ef9dc67a598c726 (patch)
treecc7e7365731000094b249b598e6b5dfdb0b7593b /target/linux
parent4a69e20a10e9a4c2f2ef6b16014de0dc0a5f7fd1 (diff)
downloadupstream-9781461a3dc0071a06bd70198ef9dc67a598c726.tar.gz
upstream-9781461a3dc0071a06bd70198ef9dc67a598c726.tar.bz2
upstream-9781461a3dc0071a06bd70198ef9dc67a598c726.zip
mvebu: update to 3.8-rc4
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 35316
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mvebu/Makefile2
-rw-r--r--target/linux/mvebu/patches-3.8/035-arm_mvebu_the_core_pcie_driver.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index 8da089ca35..76a88a17ac 100644
--- a/target/linux/mvebu/Makefile
+++ b/target/linux/mvebu/Makefile
@@ -13,7 +13,7 @@ FEATURES:=targz usb jffs2 pci pcie gpio
CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.8-rc3
+LINUX_VERSION:=3.8-rc4
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/mvebu/patches-3.8/035-arm_mvebu_the_core_pcie_driver.patch b/target/linux/mvebu/patches-3.8/035-arm_mvebu_the_core_pcie_driver.patch
index 48f828344f..1cc5f5a0c5 100644
--- a/target/linux/mvebu/patches-3.8/035-arm_mvebu_the_core_pcie_driver.patch
+++ b/target/linux/mvebu/patches-3.8/035-arm_mvebu_the_core_pcie_driver.patch
@@ -333,7 +333,7 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ return 1;
+}
+
-+static void __devinit rc_pci_fixup(struct pci_dev *dev)
++static void rc_pci_fixup(struct pci_dev *dev)
+{
+ /*
+ * Prevent enumeration of root complex.