Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index c37ee9e6b67b..39e1c0d39476 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -68,6 +68,7 @@ config W90P910_ETH
         tristate "Nuvoton w90p910 Ethernet support"
         depends on ARM && ARCH_W90X900
         select PHYLIB
+        select MII
         help
           Say Y here if you want to use built-in Ethernet ports
           on w90p910 processor.
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 691b81eb0f46..c3dfbdd2cdcf 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -322,7 +322,7 @@ static int ixp4xx_mdio_write(struct mii_bus *bus, int phy_id, int location,
         ret = ixp4xx_mdio_cmd(bus, phy_id, location, 1, val);
         spin_unlock_irqrestore(&mdio_lock, flags);
 #if DEBUG_MDIO
-        printk(KERN_DEBUG "%s #%i: MII read [%i] <- 0x%X, err = %i\n",
+        printk(KERN_DEBUG "%s #%i: MII write [%i] <- 0x%X, err = %i\n",
                bus->name, phy_id, location, val, ret);
 #endif
         return ret;