Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[deliverable/linux.git] / fs / isofs / namei.c

diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
index e7ba0c30e0711ff16669c1ec6e0e8cee20be7f74..c04b3a14a3e94b07744214a18de0a9452d35b3b7 100644 (file)
--- a/fs/isofs/namei.c
+++ b/fs/isofs/namei.c
@@ -6,7 +6,6 @@
  *  (C) 1991  Linus Torvalds - minix filesystem
  */
 
-#include <linux/config.h>      /* Joliet? */
 #include <linux/smp_lock.h>
 #include "isofs.h"