diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-17 16:35:43 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-17 16:35:43 +1100 |
| commit | b8ab7208414bb139de3a70f46370da4c0423fadc (patch) | |
| tree | b7fd12a5ecb4ff6f7af8388131ed65520a0c54eb /include/linux/magic.h | |
| parent | 047b21f11587d9ecc756de73255b16ae8e971f54 (diff) | |
| parent | 5397a83c4985c82cc508eeeead7879823bd04717 (diff) | |
Merge commit 'proc/proc'
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'include/linux/magic.h')
| -rw-r--r-- | include/linux/magic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h index 5b4e28bcb788..0cde7c7a27a7 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h @@ -33,6 +33,7 @@ #define NFS_SUPER_MAGIC 0x6969 #define OPENPROM_SUPER_MAGIC 0x9fa1 #define PROC_SUPER_MAGIC 0x9fa0 +#define PROC_NET_SUPER_MAGIC 0x706e6574 #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ #define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */ |