aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-02 10:17:03 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-02 10:17:03 +0000
commit1d4db4520ab1c4e7472a48d14ec641e2ef074b6b (patch)
treeb992b5d551457de6a5d6f53b37b9eec182c68c29 /target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
parent5c09219b13a1f3695729cc24ac7e8390859a406f (diff)
downloadmaster-187ad058-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.tar.gz
master-187ad058-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.tar.bz2
master-187ad058-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.zip
[kernel] update to 2.6.25.1 and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11006 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
index b370088aec..db8923d36c 100644
--- a/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c
---- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:12:03.000000000 +0100
-+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:11:34.000000000 +0100
-@@ -100,6 +100,36 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+@@ -100,6 +100,36 @@ static struct platform_device *wg302v1_d
&wg302_eth[0],
};
@@ -38,7 +39,7 @@ diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-o
static void __init wg302v1_init(void)
{
ixp4xx_sys_init();
-@@ -118,6 +148,7 @@
+@@ -118,6 +148,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,