Merge branch 'master' into upstream

[powerpc.git] / fs / ncpfs / sock.c

diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c
index 8783eb7..11c2b25 100644 (file)
--- a/fs/ncpfs/sock.c
+++ b/fs/ncpfs/sock.c
@@ -8,7 +8,6 @@
  *
  */
 
-#include <linux/config.h>
 
 #include <linux/time.h>
 #include <linux/errno.h>