[PATCH] Fix ISAPNP netdev initialization

Moving isapnp further down in the bus initialization obviously sparked
some new problems.

Instead, remove the legacy netdev probing function from dev.c and give
it its own initcall later in the cycle.

drivers/net/Space.c

@@ -422,7 +422,7 @@ static __init int trif_probe(int unit)
 extern int loopback_init(void);
 
 /*  Statically configured drivers -- order matters here. */
-void __init probe_old_netdevs(void)
+static int __init net_olddevs_init(void)
 {
 	int num;
 
@@ -450,8 +450,12 @@ void __init probe_old_netdevs(void)
 #ifdef CONFIG_LTPC
 	ltpc_probe();
 #endif
+
+	return 0;
 }
 
+device_initcall(net_olddevs_init);
+
 /*
  * The @dev_base list is protected by @dev_base_lock and the rtln
  * semaphore.

include/linux/netdevice.h

@@ -494,7 +494,6 @@ extern struct net_device		loopback_dev;		/* The loopback */
 extern struct net_device		*dev_base;		/* All devices */
 extern rwlock_t				dev_base_lock;		/* Device list lock */
 
-extern void		probe_old_netdevs(void);
 extern int			netdev_boot_setup_add(char *name, struct ifmap *map);
 extern int 			netdev_boot_setup_check(struct net_device *dev);
 extern struct net_device    *dev_getbyhwaddr(unsigned short type, char *hwaddr);

net/core/dev.c

@@ -3033,8 +3033,6 @@ static int __init net_dev_init(void)
 
 	dev_boot_phase = 0;
 
-	probe_old_netdevs();
-
 	open_softirq(NET_TX_SOFTIRQ, net_tx_action, NULL);
 	open_softirq(NET_RX_SOFTIRQ, net_rx_action, NULL);