X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=fs%2Fnfs%2Fsuper.c;h=76b980097621c59324a8304b5bcac824dd391a5d;hb=b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5;hp=e8d40030cab4939264b4e2d2350cea9ae6c60546;hpb=2dc94310bd94d0906febea7d0f7c188da620c952;p=sfrench%2Fcifs-2.6.git

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index e8d40030cab4..76b980097621 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -20,7 +20,6 @@
  *   of another (see nfs_lookup())
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 
@@ -45,6 +44,7 @@
 #include <linux/vfs.h>
 #include <linux/inet.h>
 #include <linux/nfs_xdr.h>
+#include <linux/magic.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -835,7 +835,7 @@ static int nfs4_get_sb(struct file_system_type *fs_type,
 	}
 	/* RFC3530: The default port for NFS is 2049 */
 	if (addr.sin_port == 0)
-		addr.sin_port = NFS_PORT;
+		addr.sin_port = htons(NFS_PORT);
 
 	/* Grab the authentication type */
 	authflavour = RPC_AUTH_UNIX;