projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
drivers
/
net
/
ns8382x.c
diff --git
a/drivers/net/ns8382x.c
b/drivers/net/ns8382x.c
index
c807dd4
..
a2d61af
100644
(file)
--- a/
drivers/net/ns8382x.c
+++ b/
drivers/net/ns8382x.c
@@
-53,12
+53,10
@@
#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 <asm/io.h>
#include <pci.h>
-#if defined(CONFIG_CMD_NET) \
- && defined(CONFIG_NET_MULTI) && defined(CONFIG_NS8382X)
-
/* defines */
#define DSIZE 0x00000FFF
#define ETH_ALEN 6
/* defines */
#define DSIZE 0x00000FFF
#define ETH_ALEN 6
@@
-773,14
+771,14
@@
ns8382x_send(struct eth_device *dev, volatile void *packet, int length)
for (i = 0; (tx_stat = le32_to_cpu(txd.cmdsts)) & DescOwn; i++) {
if (i >= TOUT_LOOP) {
for (i = 0; (tx_stat = le32_to_cpu(txd.cmdsts)) & DescOwn; i++) {
if (i >= TOUT_LOOP) {
- printf ("%s: tx error buffer not ready: txd.cmdsts %#X\n",
+ printf ("%s: tx error buffer not ready: txd.cmdsts %#
l
X\n",
dev->name, tx_stat);
goto Done;
}
}
if (!(tx_stat & DescPktOK)) {
dev->name, tx_stat);
goto Done;
}
}
if (!(tx_stat & DescPktOK)) {
- printf("ns8382x_send: Transmit error, Tx status %X.\n", tx_stat);
+ printf("ns8382x_send: Transmit error, Tx status %
l
X.\n", tx_stat);
goto Done;
}
#ifdef NS8382X_DEBUG
goto Done;
}
#ifdef NS8382X_DEBUG
@@
-859,5
+857,3
@@
ns8382x_disable(struct eth_device *dev)
/* Restore PME enable bit */
OUTL(dev, SavedClkRun, ClkRun);
}
/* Restore PME enable bit */
OUTL(dev, SavedClkRun, ClkRun);
}
-
-#endif