5 files changed, 9 insertions, 10 deletions

diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index 969fe9f443c4..3d47839a0c48 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -294,7 +294,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
                 return NOTIFY_DONE;
         }
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 return NOTIFY_DONE;
 
         if ( event != NETDEV_UP && event != NETDEV_DOWN ) return NOTIFY_DONE;
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index ba93d8ae9b0c..d5770fdf7f09 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -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);
 }
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index b46542990cf8..ab6955412ba4 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -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;
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 2c5388ce902a..3581416905ea 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -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);
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index dcc3ec2ef643..a72f208e62d0 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -538,11 +538,9 @@ CONFIG_CTC=m
 # CONFIG_SMSGIUCV is not set
 # CONFIG_CLAW is not set
 CONFIG_QETH=y
-
-#
-# Gigabit Ethernet default settings
-#
-# CONFIG_QETH_IPV6 is not set
+CONFIG_QETH_L2=y
+CONFIG_QETH_L3=y
+CONFIG_QETH_IPV6=y
 CONFIG_CCWGROUP=y
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set