X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fnet%2Fplb2800_eth.c;h=d799c738234737969b3e0847e765eec5e03043b6;hb=0b23fb368d08c9669fac647971ff249c3f9fee8f;hp=0ae5d808a6f9d055ad73f2202737adf4c58f1dbb;hpb=74ac5facb988fc488a707db228b177ead63a6541;p=u-boot

diff --git a/drivers/net/plb2800_eth.c b/drivers/net/plb2800_eth.c
index 0ae5d808a6..d799c73823 100644
--- a/drivers/net/plb2800_eth.c
+++ b/drivers/net/plb2800_eth.c
@@ -24,12 +24,9 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_CMD_NET) \
-	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_PLB2800_ETHER)
-
 #include <malloc.h>
 #include <net.h>
+#include <netdev.h>
 #include <asm/addrspace.h>
 
 
@@ -109,7 +106,7 @@ int plb2800_eth_initialize(bd_t * bis)
 	if (!(dev = (struct eth_device *) malloc (sizeof *dev)))
 	{
 		printf("Failed to allocate memory\n");
-		return 0;
+		return -1;
 	}
 	memset(dev, 0, sizeof(*dev));
 
@@ -144,7 +141,7 @@ int plb2800_eth_initialize(bd_t * bis)
 	printf("Leaving plb2800_eth_initialize()\n");
 #endif
 
-	return 1;
+	return 0;
 }
 
 static int plb2800_eth_init(struct eth_device *dev, bd_t * bis)
@@ -333,7 +330,7 @@ static void plb2800_set_mac_addr(struct eth_device *dev, unsigned char * addr)
 	DA_LOOKUP = temp;
 
 	/* Set MA_LEARN register */
-	temp = 50 << MA_DEST_SHF; 	/* static entry */
+	temp = 50 << MA_DEST_SHF;	/* static entry */
 	MA_LEARN = temp;
 
 	/* set destination address */
@@ -392,5 +389,3 @@ static unsigned char * plb2800_get_mac_addr(void)
 
 	return addr;
 }
-
-#endif /* CONFIG_PLB2800_ETHER */