Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e5a3eac authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 8c95b477 36b30ea9

arch/powerpc/platforms/82xx/ep8248e.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev, 


	bus->name = "ep8248e-mdio-bitbang";

	bus->dev = &ofdev->dev;

	bus->id = res.start;

	snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);



	return mdiobus_register(bus);

}

arch/powerpc/platforms/pasemi/gpio_mdio.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev, 
	new_bus->reset = &gpio_mdio_reset;



	prop = of_get_property(np, "reg", NULL);

	new_bus->id = *prop;

	snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", *prop);

	new_bus->priv = priv;



	new_bus->phy_mask = 0;

arch/powerpc/sysdev/fsl_soc.c

+3 −2
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static int __init gfar_of_init(void) 
				goto unreg;

			}



			gfar_data.bus_id = 0;

			snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "0");

			gfar_data.phy_id = fixed_link[0];

		} else {

			phy = of_find_node_by_phandle(*ph);
@@ -362,7 +362,8 @@ static int __init gfar_of_init(void) 
			}



			gfar_data.phy_id = *id;

			gfar_data.bus_id = res.start;

			snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%x",

					res.start);



			of_node_put(phy);

			of_node_put(mdio);

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ config CS89x0 
config TC35815

	tristate "TOSHIBA TC35815 Ethernet support"

	depends on NET_PCI && PCI && MIPS

	select MII

	select PHYLIB



config EEPRO100

	tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"

drivers/net/au1000_eth.c

+3 −3
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ static struct net_device * au1000_probe(int port_num) 
	aup->mii_bus.write = mdiobus_write;

	aup->mii_bus.reset = mdiobus_reset;

	aup->mii_bus.name = "au1000_eth_mii";

	aup->mii_bus.id = aup->mac_id;

	snprintf(aup->mii_bus.id, MII_BUS_ID_SIZE, "%x", aup->mac_id);

	aup->mii_bus.irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);

	for(i = 0; i < PHY_MAX_ADDR; ++i)

		aup->mii_bus.irq[i] = PHY_POLL;
@@ -709,11 +709,11 @@ static struct net_device * au1000_probe(int port_num) 
	/* if known, set corresponding PHY IRQs */

#if defined(AU1XXX_PHY_STATIC_CONFIG)

# if defined(AU1XXX_PHY0_IRQ)

	if (AU1XXX_PHY0_BUSID == aup->mii_bus.id)

	if (AU1XXX_PHY0_BUSID == aup->mac_id)

		aup->mii_bus.irq[AU1XXX_PHY0_ADDR] = AU1XXX_PHY0_IRQ;

# endif

# if defined(AU1XXX_PHY1_IRQ)

	if (AU1XXX_PHY1_BUSID == aup->mii_bus.id)

	if (AU1XXX_PHY1_BUSID == aup->mac_id)

		aup->mii_bus.irq[AU1XXX_PHY1_ADDR] = AU1XXX_PHY1_IRQ;

# endif

#endif