aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-04-14 09:25:53 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-04-14 09:25:53 +0000
commit604395650ae3ca2c4eda4dbe6f9e4743e041f53f (patch)
treebe5edf58993c0eac92478a78899054fcd409dcc6 /target/linux/mvebu
parent68c54dc34fdc58b65f346fdded8ca40f7f656f5e (diff)
downloadupstream-604395650ae3ca2c4eda4dbe6f9e4743e041f53f.tar.gz
upstream-604395650ae3ca2c4eda4dbe6f9e4743e041f53f.tar.bz2
upstream-604395650ae3ca2c4eda4dbe6f9e4743e041f53f.zip
kernel: update linux 3.8 to 3.8.7
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 36332
Diffstat (limited to 'target/linux/mvebu')
-rw-r--r--target/linux/mvebu/Makefile2
-rw-r--r--target/linux/mvebu/patches-3.8/028-lib_devres_dont_enclose_pcim.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index c9d5ab4beb..22fd05a737 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.6
+LINUX_VERSION:=3.8.7
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/mvebu/patches-3.8/028-lib_devres_dont_enclose_pcim.patch b/target/linux/mvebu/patches-3.8/028-lib_devres_dont_enclose_pcim.patch
index 3872924a61..3cde2a308e 100644
--- a/target/linux/mvebu/patches-3.8/028-lib_devres_dont_enclose_pcim.patch
+++ b/target/linux/mvebu/patches-3.8/028-lib_devres_dont_enclose_pcim.patch
@@ -13,7 +13,7 @@ Cc: linux-kernel@vger.kernel.org
--- a/lib/devres.c
+++ b/lib/devres.c
-@@ -195,6 +195,7 @@ void devm_ioport_unmap(struct device *de
+@@ -226,6 +226,7 @@ void devm_ioport_unmap(struct device *de
devm_ioport_map_match, (void *)addr));
}
EXPORT_SYMBOL(devm_ioport_unmap);
@@ -21,7 +21,7 @@ Cc: linux-kernel@vger.kernel.org
#ifdef CONFIG_PCI
/*
-@@ -400,4 +401,3 @@ void pcim_iounmap_regions(struct pci_dev
+@@ -431,4 +432,3 @@ void pcim_iounmap_regions(struct pci_dev
}
EXPORT_SYMBOL(pcim_iounmap_regions);
#endif /* CONFIG_PCI */