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
commitd8987676ecf4073b10824ff48a94d47bc5504d98 (patch)
treea44f1bdee35d9e09d2e6e49a8f3109228aa2a7cf /target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
parent0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2 (diff)
downloadmaster-187ad058-d8987676ecf4073b10824ff48a94d47bc5504d98.tar.gz
master-187ad058-d8987676ecf4073b10824ff48a94d47bc5504d98.tar.bz2
master-187ad058-d8987676ecf4073b10824ff48a94d47bc5504d98.zip
refresh ixp4xx patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11297 3c298f89-4303-0410-b956-a3cf2f4a3e73
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);