X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fnet%2Fuli526x.c;h=9477851a75e0d3253055654ac26af36bca117504;hb=cb17b92de03416cf4d5db5bd27ef4ae17f95e707;hp=d64845fec8506ababe404f768645af671c90e8c5;hpb=e845e07e1e6e64f40e35688439d3cdcf01cfff4f;p=u-boot

diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index d64845fec8..9477851a75 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) 2007 Freescale Semiconductor, Inc.
  *
  * Author: Roy Zang <tie-fei.zang@freescale.com>, Sep, 2007
  *
@@ -16,15 +16,13 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
+#include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <miiphy.h>
 
 /* some kernel function compatible define */
 
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-	defined(CONFIG_ULI526X)
-
 #undef DEBUG
 
 /* Board/System/Debug information/definition */
@@ -412,7 +410,7 @@ static void uli526x_init(struct eth_device *dev)
 	}
 	/* Media Mode Process */
 	if (!(db->media_mode & ULI526X_AUTO))
-		db->op_mode = db->media_mode; 	/* Force Mode */
+		db->op_mode = db->media_mode;	/* Force Mode */
 
 	/* Initialize Transmit/Receive decriptor and CR3/4 */
 	uli526x_descriptor_init(db, db->ioaddr);
@@ -566,7 +564,7 @@ static int uli526x_rx_packet(struct eth_device *dev)
 			/* error summary bit check */
 			if (rdes0 & 0x8000) {
 				/* This is a error packet */
-				printf("Eroor: rdes0: %lx\n", rdes0);
+				printf("Error: rdes0: %x\n", rdes0);
 			}
 
 			if (!(rdes0 & 0x8000) ||
@@ -993,4 +991,3 @@ static void set_mac_addr(struct eth_device *dev)
 	udelay(10);
 	return;
 }
-#endif