update to 2.6.25.1 and refresh patches

[openwrt/staging/wigyori.git] / target / linux / ixp4xx / patches-2.6.25 / 111-pronghorn_metro_mac_plat_info.patch

diff --git a/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
index 2fb376982a4128723499433091072ab7eae21efb..3a523d190b9eaa7de49718770e5e7ca43056f766 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c   2007-10-22 15:41:27.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c      2007-10-22 15:43:30.000000000 +0200
-@@ -104,9 +104,36 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+@@ -104,9 +104,36 @@ static struct platform_device pronghornm
        .resource               = pronghornmetro_pata_resources,
  };