Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

[pandora-kernel.git] / fs / affs / super.c

diff --git a/fs/affs/super.c b/fs/affs/super.c
index 5200f49..1735201 100644 (file)
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/statfs.h>
 #include <linux/parser.h>
+#include <linux/magic.h>
 #include "affs.h"
 
 extern struct timezone sys_tz;