aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 16:32:35 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 16:32:35 +0000
commit9285574b20298c1499aedee162f5659e1e356862 (patch)
treed5f50bfbd765bba8d95d15fa170f7d487a7d1d49 /target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
parentf664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (diff)
downloadupstream-9285574b20298c1499aedee162f5659e1e356862.tar.gz
upstream-9285574b20298c1499aedee162f5659e1e356862.tar.bz2
upstream-9285574b20298c1499aedee162f5659e1e356862.zip
refresh ixp4xx patches to match upstream style
SVN-Revision: 11297
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
index 26267c827b..c1c584c612 100644
--- a/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
-===================================================================
---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -132,6 +132,31 @@ static struct platform_device avila_pata
+--- a/arch/arm/mach-ixp4xx/avila-setup.c
++++ b/arch/arm/mach-ixp4xx/avila-setup.c
+@@ -132,6 +132,31 @@
.resource = avila_pata_resources,
};
@@ -34,7 +32,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
static struct platform_device *avila_devices[] __initdata = {
&avila_i2c_gpio,
&avila_flash,
-@@ -159,6 +184,8 @@ static void __init avila_init(void)
+@@ -159,6 +184,8 @@
platform_device_register(&avila_pata);