aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/au1000
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-06-04 13:35:55 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-06-04 13:35:55 +0000
commitc8baad652d1f32a71d6b25892665ded30b33f748 (patch)
tree3350e421172690b9f7c942effd46a963e6cb1f3e /target/linux/au1000
parent51fb87ec2fffc5fa47da0d223fb700fefad03e16 (diff)
downloadupstream-c8baad652d1f32a71d6b25892665ded30b33f748.tar.gz
upstream-c8baad652d1f32a71d6b25892665ded30b33f748.tar.bz2
upstream-c8baad652d1f32a71d6b25892665ded30b33f748.zip
[kernel] update to 2.6.39.1
patch from Peter Wagner git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27104 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/au1000')
-rw-r--r--target/linux/au1000/Makefile2
-rw-r--r--target/linux/au1000/patches-2.6.39/002-openwrt_rootfs.patch2
-rw-r--r--target/linux/au1000/patches-2.6.39/003-au1000_eth_ioctl.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile
index f90116fe78..bc628728cb 100644
--- a/target/linux/au1000/Makefile
+++ b/target/linux/au1000/Makefile
@@ -13,7 +13,7 @@ FEATURES:=jffs2 usb pci
SUBTARGETS=au1500 au1550
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=2.6.39
+LINUX_VERSION:=2.6.39.1
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini yamonenv
diff --git a/target/linux/au1000/patches-2.6.39/002-openwrt_rootfs.patch b/target/linux/au1000/patches-2.6.39/002-openwrt_rootfs.patch
index e1056e93d9..7d34a314d6 100644
--- a/target/linux/au1000/patches-2.6.39/002-openwrt_rootfs.patch
+++ b/target/linux/au1000/patches-2.6.39/002-openwrt_rootfs.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/alchemy/mtx-1/platform.c
+++ b/arch/mips/alchemy/mtx-1/platform.c
-@@ -90,7 +90,7 @@ static struct platform_device mtx1_gpio_
+@@ -92,7 +92,7 @@ static struct platform_device mtx1_gpio_
static struct mtd_partition mtx1_mtd_partitions[] = {
{
diff --git a/target/linux/au1000/patches-2.6.39/003-au1000_eth_ioctl.patch b/target/linux/au1000/patches-2.6.39/003-au1000_eth_ioctl.patch
index c005cbc16d..1bf8754172 100644
--- a/target/linux/au1000/patches-2.6.39/003-au1000_eth_ioctl.patch
+++ b/target/linux/au1000/patches-2.6.39/003-au1000_eth_ioctl.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
-@@ -995,10 +995,14 @@ static void au1000_multicast_list(struct
+@@ -993,10 +993,14 @@ static void au1000_multicast_list(struct
writel(reg, &aup->mac->control);
}