summaryrefslogtreecommitdiff
path: root/include/linux/magic.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-20 13:28:56 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-10-20 13:28:56 +0200
commitb6a4b7de4cb45ccf7157fc58de09c96f84d67108 (patch)
tree016630974bdcb00fe529b673f96d389e0fd6dc94 /include/linux/magic.h
parent2778d0d51dd5007c4909c1d9874f5e9097785a7a (diff)
parent651dab4264e4ba0e563f5ff56f748127246e9065 (diff)
downloadlwn-b6a4b7de4cb45ccf7157fc58de09c96f84d67108.tar.gz
lwn-b6a4b7de4cb45ccf7157fc58de09c96f84d67108.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-hrtimer into timers/range-hrtimers
Diffstat (limited to 'include/linux/magic.h')
-rw-r--r--include/linux/magic.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h
index 1fa0c2ce4dec..f7f3fdddbef0 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -6,6 +6,10 @@
#define AFS_SUPER_MAGIC 0x5346414F
#define AUTOFS_SUPER_MAGIC 0x0187
#define CODA_SUPER_MAGIC 0x73757245
+#define DEBUGFS_MAGIC 0x64626720
+#define SYSFS_MAGIC 0x62656572
+#define SECURITYFS_MAGIC 0x73636673
+#define TMPFS_MAGIC 0x01021994
#define EFS_SUPER_MAGIC 0x414A53
#define EXT2_SUPER_MAGIC 0xEF53
#define EXT3_SUPER_MAGIC 0xEF53