Merge branch 'upstream'

[linux-2.6] / fs / hfsplus / dir.c

diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index 7bda76667a4af0a71a3570bd7dca8e14e2861218..50c8f44b6c665f6e605957346515b9ea6e524af5 100644 (file)
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -13,7 +13,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/random.h>
-#include <linux/version.h>
 
 #include "hfsplus_fs.h"
 #include "hfsplus_raw.h"