linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / ixp2000 / enp2611.c

diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c
index d3f4235..d82651a 100644 (file)
--- a/drivers/net/ixp2000/enp2611.c
+++ b/drivers/net/ixp2000/enp2611.c
@@ -9,13 +9,14 @@
  * (at your option) any later version.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/moduleparam.h>
-#include <asm/hardware/uengine.h>
+#include <asm/arch/uengine.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include "ixpdev.h"
@@ -148,8 +149,6 @@ static void enp2611_check_link_status(unsigned long __dummy)
                int status;
 
                dev = nds[i];
-               if (dev == NULL)
-                       continue;
 
                status = pm3386_is_link_up(i);
                if (status && !netif_carrier_ok(dev)) {
@@ -192,7 +191,6 @@ static void enp2611_set_port_admin_status(int port, int up)
 
 static int __init enp2611_init_module(void)
 { 
-       int ports;
        int i;
 
        if (!machine_is_enp2611())
@@ -201,8 +199,7 @@ static int __init enp2611_init_module(void)
        caleb_reset();
        pm3386_reset();
 
-       ports = pm3386_port_count();
-       for (i = 0; i < ports; i++) {
+       for (i = 0; i < 3; i++) {
                nds[i] = ixpdev_alloc(i, sizeof(struct enp2611_ixpdev_priv));
                if (nds[i] == NULL) {
                        while (--i >= 0)
@@ -218,10 +215,9 @@ static int __init enp2611_init_module(void)
 
        ixp2400_msf_init(&enp2611_msf_parameters);
 
-       if (ixpdev_init(ports, nds, enp2611_set_port_admin_status)) {
-               for (i = 0; i < ports; i++)
-                       if (nds[i])
-                               free_netdev(nds[i]);
+       if (ixpdev_init(3, nds, enp2611_set_port_admin_status)) {
+               for (i = 0; i < 3; i++)
+                       free_netdev(nds[i]);
                return -EINVAL;
        }