[ixp4xx] include/asm-arm/arch-ixp4xx/io.h must include linux/bitops.h on 2.6.24
[openwrt.git] / target / linux / ixp4xx / patches-2.6.24 / 111-pronghorn_metro_mac_plat_info.patch
1 diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
2 --- linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c    2007-10-22 15:41:27.000000000 +0200
3 +++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c       2007-10-22 15:43:30.000000000 +0200
4 @@ -104,9 +104,36 @@
5         .resource               = pronghornmetro_pata_resources,
6  };
7  
8 +/* Built-in 10/100 Ethernet MAC interfaces */
9 +static struct eth_plat_info pronghornmetro_plat_eth[] = {
10 +        {
11 +                .phy            = 0,
12 +                .rxq            = 3,
13 +               .txreadyq       = 20,
14 +        }, {
15 +                .phy            = 1,
16 +                .rxq            = 4,
17 +               .txreadyq       = 21,
18 +       }
19 +};
20 +
21 +static struct platform_device pronghornmetro_eth[] = {
22 +        {
23 +                .name                   = "ixp4xx_eth",
24 +                .id                     = IXP4XX_ETH_NPEB,
25 +                .dev.platform_data      = pronghornmetro_plat_eth,
26 +        }, {
27 +                .name                   = "ixp4xx_eth",
28 +                .id                     = IXP4XX_ETH_NPEC,
29 +                .dev.platform_data      = pronghornmetro_plat_eth + 1,
30 +       }
31 +};
32 +
33  static struct platform_device *pronghornmetro_devices[] __initdata = {
34         &pronghornmetro_flash,
35         &pronghornmetro_uart,
36 +       &pronghornmetro_eth[0],
37 +       &pronghornmetro_eth[1],
38  };
39  
40  static void __init pronghornmetro_init(void)