Merge branch 'u-boot/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / board / Marvell / db64460 / mv_eth.h

diff --git a/board/Marvell/db64460/mv_eth.h b/board/Marvell/db64460/mv_eth.h
index cbe751a4ceeee01c2c956660aef61444f49923ac..1107e959baaa3f793bf92670aceac8cca0429e1e 100644 (file)
--- a/board/Marvell/db64460/mv_eth.h
+++ b/board/Marvell/db64460/mv_eth.h
@@ -47,13 +47,6 @@
 **************************************************************************
 **************************************************************************
 *************************************************************************/
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
 /* In case not using SG on Tx, define MAX_SKB_FRAGS as 0 */
 #ifndef MAX_SKB_FRAGS
 #define MAX_SKB_FRAGS 0
@@ -166,9 +159,7 @@ struct mv64460_eth_priv {
 
 int mv64460_eth_init (struct eth_device *dev);
 int mv64460_eth_stop (struct eth_device *dev);
-int mv64460_eth_start_xmit (struct eth_device*, volatile void* packet, int length);
-/*     return db64460_eth0_poll(); */
-
+int mv64460_eth_start_xmit(struct eth_device *dev, void *packet, int length);
 int mv64460_eth_open (struct eth_device *dev);