git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6-watchdog-mm
[pandora-kernel.git]
/
drivers
/
net
/
Space.c
diff --git
a/drivers/net/Space.c
b/drivers/net/Space.c
index
a67f5ef
..
9305eb9
100644
(file)
--- a/
drivers/net/Space.c
+++ b/
drivers/net/Space.c
@@
-33,7
+33,6
@@
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/netlink.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/netlink.h>
-#include <linux/divert.h>
/* A unified ethernet device probe. This is the easiest way to have every
ethernet adaptor have the name "eth[0123...]".
/* A unified ethernet device probe. This is the easiest way to have every
ethernet adaptor have the name "eth[0123...]".
@@
-350,22
+349,11
@@
static void __init trif_probe2(int unit)
#endif
#endif
-/*
- * The loopback device is global so it can be directly referenced
- * by the network code. Also, it must be first on device list.
- */
-extern int loopback_init(void);
-
/* Statically configured drivers -- order matters here. */
static int __init net_olddevs_init(void)
{
int num;
/* Statically configured drivers -- order matters here. */
static int __init net_olddevs_init(void)
{
int num;
- if (loopback_init()) {
- printk(KERN_ERR "Network loopback device setup failed\n");
- }
-
-
#ifdef CONFIG_SBNI
for (num = 0; num < 8; ++num)
sbni_probe(num);
#ifdef CONFIG_SBNI
for (num = 0; num < 8; ++num)
sbni_probe(num);