diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:32:35 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:32:35 +0000 |
| commit | 9285574b20298c1499aedee162f5659e1e356862 (patch) | |
| tree | d5f50bfbd765bba8d95d15fa170f7d487a7d1d49 /target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch | |
| parent | f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (diff) | |
| download | master-31e0f0ae-9285574b20298c1499aedee162f5659e1e356862.tar.gz master-31e0f0ae-9285574b20298c1499aedee162f5659e1e356862.tar.bz2 master-31e0f0ae-9285574b20298c1499aedee162f5659e1e356862.zip | |
refresh ixp4xx patches to match upstream style
SVN-Revision: 11297
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch index 1d154c6691..db25efbea6 100644 --- a/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch +++ b/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch @@ -1,7 +1,5 @@ -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 +--- a/arch/arm/mach-ixp4xx/avila-setup.c ++++ b/arch/arm/mach-ixp4xx/avila-setup.c @@ -14,10 +14,18 @@ #include <linux/kernel.h> #include <linux/init.h> @@ -35,7 +33,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c static struct flash_platform_data avila_flash_data = { .map_name = "cfi_probe", .width = 2, -@@ -163,10 +178,160 @@ static struct platform_device *avila_dev +@@ -163,10 +178,160 @@ &avila_uart }; @@ -196,7 +194,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; -@@ -184,9 +349,28 @@ static void __init avila_init(void) +@@ -184,9 +349,28 @@ platform_device_register(&avila_pata); |