diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2007-06-10 12:17:41 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2007-06-10 12:17:41 +0000 |
| commit | c8c5094e94b911f354a0c352a16cfbb534c1f4d0 (patch) | |
| tree | e0d1ee9336727e1e51aaf89cd9cf07ef4972900a /target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch | |
| parent | 1a7b432a41450758f22f1b4512dba870cc1cdf74 (diff) | |
| download | upstream-c8c5094e94b911f354a0c352a16cfbb534c1f4d0.tar.gz upstream-c8c5094e94b911f354a0c352a16cfbb534c1f4d0.tar.bz2 upstream-c8c5094e94b911f354a0c352a16cfbb534c1f4d0.zip | |
new, cleaner Pronghorn Metro patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7543 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch')
| -rw-r--r-- | target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch b/target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch index 17b6b3642a..54621d6c3e 100644 --- a/target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch +++ b/target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch @@ -1,7 +1,7 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-04-02 21:30:12.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-04-02 21:57:11.000000000 +0200 -@@ -87,10 +87,58 @@ +diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +--- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:05:47.000000000 +0200 ++++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:05:38.000000000 +0200 +@@ -76,9 +76,57 @@ .resource = &pronghornmetro_uart_resource, }; @@ -52,10 +52,8 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.1 +}; + static struct platform_device *pronghornmetro_devices[] __initdata = { - &pronghornmetro_i2c_controller, &pronghornmetro_flash, -- &pronghornmetro_uart -+ &pronghornmetro_uart, + &pronghornmetro_uart, + &mac0, + &mac1, }; |