Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

[~andy/linux] / fs / nls / nls_base.c

diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index a912debcd20b3c27850c4e5754e164888a0a9e9d..9de6b495f1128c09dd7c7d87767473e0431122cd 100644 (file)
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -10,7 +10,6 @@
 
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/config.h>
 #include <linux/nls.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>