aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.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/121-compex_mac_plat_info.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/121-compex_mac_plat_info.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
index 081349ad3d..ffca727f2a 100644
--- a/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c 2007-10-23 18:39:29.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-10-23 18:45:34.000000000 +0200
-@@ -90,9 +90,36 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/compex-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
+@@ -90,9 +90,36 @@ static struct platform_device compex_uar
.resource = compex_uart_resources,
};