diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-01-11 07:23:58 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2008-01-11 07:23:58 +0000 |
| commit | 45af6f04d110f2ac9bb548a5664d254ccb80c1ba (patch) | |
| tree | 9e5992e8d0c349a24173d1daa313a02dab801a7c /target/linux/ixp4xx/patches-2.6.23/052-nas100d_mac_plat_info.patch | |
| parent | f002f44eb13ee6522555c00cd961a174ed8e4dff (diff) | |
| download | upstream-45af6f04d110f2ac9bb548a5664d254ccb80c1ba.tar.gz upstream-45af6f04d110f2ac9bb548a5664d254ccb80c1ba.tar.bz2 upstream-45af6f04d110f2ac9bb548a5664d254ccb80c1ba.zip | |
Combined the nas100d net driver patches, based on new nslu2-linux patch
SVN-Revision: 10166
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.23/052-nas100d_mac_plat_info.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.23/052-nas100d_mac_plat_info.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/052-nas100d_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/052-nas100d_mac_plat_info.patch deleted file mode 100644 index 3196e0368c..0000000000 --- a/target/linux/ixp4xx/patches-2.6.23/052-nas100d_mac_plat_info.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c -index 54d884f..d4d8540 100644 ---- a/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c -@@ -125,12 +125,30 @@ static struct platform_device nas100d_uart = { - .resource = nas100d_uart_resources, - }; - -+/* Built-in 10/100 Ethernet MAC interfaces */ -+static struct eth_plat_info nas100d_plat_eth[] = { -+ { -+ .phy = 0, -+ .rxq = 3, -+ .txreadyq = 20, -+ } -+}; -+ -+static struct platform_device nas100d_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = nas100d_plat_eth, -+ } -+}; -+ - static struct platform_device *nas100d_devices[] __initdata = { - &nas100d_i2c_gpio, - &nas100d_flash, - #ifdef CONFIG_LEDS_IXP4XX - &nas100d_leds, - #endif -+ &nas100d_eth[0], - }; - - static void nas100d_power_off(void) |