mpc83xx: Add support for MergerBox board

[u-boot] / net / rarp.c

diff --git a/net/rarp.c b/net/rarp.c
index 71056962629f710dcb15db6040aaac09d0ca91c7..94c86d3429b7f7479aa2dbb1c0f5dd53b16ac1d0 100644 (file)
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -29,8 +29,6 @@
 #include "rarp.h"
 #include "tftp.h"
 
-#if defined(CONFIG_CMD_NET)
-
 #define TIMEOUT                5000UL  /* Milliseconds before trying BOOTP again */
 #ifndef        CONFIG_NET_RETRY_COUNT
 # define TIMEOUT_COUNT 5               /* # of timeouts before giving up  */
@@ -45,12 +43,11 @@ int         RarpTry;
  *     Handle a RARP received packet.
  */
 static void
-RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3)
+RarpHandler(uchar *dummi0, unsigned dummi1, IPaddr_t sip, unsigned dummi2,
+           unsigned dummi3)
 {
        char *s;
-#ifdef DEBUG
-       puts ("Got good RARP\n");
-#endif
+       debug("Got good RARP\n");
        if ((s = getenv("autoload")) != NULL) {
                if (*s == 'n') {
                        /*
@@ -118,5 +115,3 @@ RarpRequest (void)
        NetSetTimeout(TIMEOUT, RarpTimeout);
        NetSetHandler(RarpHandler);
 }
-
-#endif