Merge branch 'master' into tk71

[mv-sheeva.git] / fs / ncpfs / sock.c

diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c
index c7ff6c700a6efdca195b43a18414e221ecafc824..3a1587222c8a7a3eeea9b2990a3d734d313e767f 100644 (file)
--- a/fs/ncpfs/sock.c
+++ b/fs/ncpfs/sock.c
@@ -28,7 +28,7 @@
 #include <linux/poll.h>
 #include <linux/file.h>
 
-#include <linux/ncp_fs.h>
+#include "ncp_fs.h"
 
 #include "ncpsign_kernel.h"
 
@@ -746,7 +746,6 @@ static int ncp_do_request(struct ncp_server *server, int size,
                return -EIO;
        }
        if (!ncp_conn_valid(server)) {
-               printk(KERN_ERR "ncpfs: Connection invalid!\n");
                return -EIO;
        }
        {