summaryrefslogtreecommitdiffstats
path: root/fs/squashfs/super.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-01-22 10:03:02 +0100
committerThomas Gleixner <tglx@linutronix.de>2009-01-22 10:03:02 +0100
commit6552ebae25ffd57574c6e72d17fce67fea08b918 (patch)
treecde6cc932c7e47d818154b011dfd8a6997d5c18e /fs/squashfs/super.c
parentrcu: remove duplicate CONFIG_RCU_CPU_STALL_DETECTOR (diff)
parentdebugobjects: add and use INIT_WORK_ON_STACK (diff)
downloadlinux-6552ebae25ffd57574c6e72d17fce67fea08b918.tar.xz
linux-6552ebae25ffd57574c6e72d17fce67fea08b918.zip
Merge branch 'core/debugobjects' into core/urgent
Diffstat (limited to 'fs/squashfs/super.c')
-rw-r--r--fs/squashfs/super.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index a0466d7467b2..071df5b5b491 100644
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/zlib.h>
+#include <linux/magic.h>
#include "squashfs_fs.h"
#include "squashfs_fs_sb.h"