diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 12:13:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 12:13:10 -0400 |
| commit | 7b3b6e42032e94a6132a85642e95106f5346650e (patch) | |
| tree | 8b2262291341d8a9f9b1e7e3c63a3289bb6c6de6 /include/linux/magic.h | |
| parent | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into topic/asoc
Diffstat (limited to 'include/linux/magic.h')
| -rw-r--r-- | include/linux/magic.h | 4 |
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 @@ | |||
| 6 | #define AFS_SUPER_MAGIC 0x5346414F | 6 | #define AFS_SUPER_MAGIC 0x5346414F |
| 7 | #define AUTOFS_SUPER_MAGIC 0x0187 | 7 | #define AUTOFS_SUPER_MAGIC 0x0187 |
| 8 | #define CODA_SUPER_MAGIC 0x73757245 | 8 | #define CODA_SUPER_MAGIC 0x73757245 |
| 9 | #define DEBUGFS_MAGIC 0x64626720 | ||
| 10 | #define SYSFS_MAGIC 0x62656572 | ||
| 11 | #define SECURITYFS_MAGIC 0x73636673 | ||
| 12 | #define TMPFS_MAGIC 0x01021994 | ||
| 9 | #define EFS_SUPER_MAGIC 0x414A53 | 13 | #define EFS_SUPER_MAGIC 0x414A53 |
| 10 | #define EXT2_SUPER_MAGIC 0xEF53 | 14 | #define EXT2_SUPER_MAGIC 0xEF53 |
| 11 | #define EXT3_SUPER_MAGIC 0xEF53 | 15 | #define EXT3_SUPER_MAGIC 0xEF53 |