projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-net
[oweals/u-boot.git]
/
drivers
/
net
/
uli526x.c
diff --git
a/drivers/net/uli526x.c
b/drivers/net/uli526x.c
index 79d29ae82200fac7d4f5de69df2e5b67ba412af0..9477851a75e0d3253055654ac26af36bca117504 100644
(file)
--- 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
*
*
* Author: Roy Zang <tie-fei.zang@freescale.com>, Sep, 2007
*
@@
-16,15
+16,13
@@
#include <common.h>
#include <malloc.h>
#include <net.h>
#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 */
#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 */
#undef DEBUG
/* Board/System/Debug information/definition */
@@
-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 */
/* error summary bit check */
if (rdes0 & 0x8000) {
/* This is a error packet */
- printf("Er
oor: rdes0: %l
x\n", rdes0);
+ printf("Er
ror: rdes0: %
x\n", rdes0);
}
if (!(rdes0 & 0x8000) ||
}
if (!(rdes0 & 0x8000) ||
@@
-993,4
+991,3
@@
static void set_mac_addr(struct eth_device *dev)
udelay(10);
return;
}
udelay(10);
return;
}
-#endif