Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6-omap-h63xx.git] / drivers / net / fec_8xx / fec_mii.c

diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c
index e79700abf7b651aec8c87609cf13e42cf8dcdeaa..3b6ca29d31f253ef0d9fcde1279d9875bcd62f70 100644 (file)
--- a/drivers/net/fec_8xx/fec_mii.c
+++ b/drivers/net/fec_8xx/fec_mii.c
@@ -19,7 +19,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
@@ -35,7 +34,7 @@
 #include <asm/mpc8xx.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
 
 /*************************************************/
 
@@ -309,12 +308,11 @@ int fec_mii_phy_id_detect(struct net_device *dev)
                return -1;
        }
 
-       for (i = 0, phy = phy_info; i < sizeof(phy_info) / sizeof(phy_info[0]);
-            i++, phy++)
+       for (i = 0, phy = phy_info; i < ARRAY_SIZE(phy_info); i++, phy++)
                if (phy->id == (phy_hwid >> 4) || phy->id == 0)
                        break;
 
-       if (i >= sizeof(phy_info) / sizeof(phy_info[0])) {
+       if (i >= ARRAY_SIZE(phy_info)) {
                printk(KERN_ERR DRV_MODULE_NAME
                       ": %s PHY id 0x%08x is not supported!\n",
                       dev->name, phy_hwid);