Merge remote-tracking branch 'mpc83xx/next'

[karo-tx-uboot.git] / net / nfs.c

diff --git a/net/nfs.c b/net/nfs.c
index db73e93380d9e35ca8935c85a8d839416410088a..7f2393f6064c62976ea3bf0c5f10a2ac22e7d443 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -31,7 +31,11 @@
 
 #define HASHES_PER_LINE 65     /* Number of "loading" hashes per line  */
 #define NFS_RETRY_COUNT 30
-#define NFS_TIMEOUT 2000UL
+#ifndef CONFIG_NFS_TIMEOUT
+# define NFS_TIMEOUT 2000UL
+#else
+# define NFS_TIMEOUT CONFIG_NFS_TIMEOUT
+#endif
 
 static int fs_mounted;
 static unsigned long rpc_id;
@@ -735,7 +739,7 @@ NfsStart(void)
                "Loading: *\b", load_addr);
 
        NetSetTimeout(NFS_TIMEOUT, NfsTimeout);
-       NetSetHandler(NfsHandler);
+       net_set_udp_handler(NfsHandler);
 
        NfsTimeoutCount = 0;
        NfsState = STATE_PRCLOOKUP_PROG_MOUNT_REQ;