commit 11b180ac3f104f22c9fc0d76efc7b4454efd1467
author H. Peter Anvin <hpa@zytor.com> Thu Aug 19 16:09:23 2004 +0000
committer H. Peter Anvin <hpa@zytor.com> Thu Aug 19 16:09:23 2004 +0000
tree 64691875e139f85ad742a13733903c875af777c8
parent fa2a4ca07c34d16af04503eef4807cb0923591a6

Fix merge errors

ipconfig/main.c

diff --git a/ipconfig/main.c b/ipconfig/main.c
index 8845146..dcd767f 100644
--- a/ipconfig/main.c
+++ b/ipconfig/main.c
@@ -439,18 +439,7 @@
 	return caps;
 }
 
-static void bringup_device(struct netdev *dev)
-{
-	if (netdev_up(dev) == 0) {
-		if (dev->caps) {
-			add_one_dev(dev);
-		} else {
-			complete_device(dev);
-		}
-	}
-}
-
-static void add_all_devices(struct netdev *template);
+static int add_all_devices(struct netdev *template);
 
 static int parse_device(struct netdev *dev, const char *ip)
 {