diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-04 01:12:40 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-04 01:12:40 +0300 |
| commit | 9643f5d94aadd47a5fa9754fb60f2c957de05903 (patch) | |
| tree | c299736cbcdd7f971c1c308433e248198060fefa /include/linux/magic.h | |
| parent | 2bd3a997befc226ab4b504f05c5cbba305f3e0e6 (diff) | |
| parent | c44dcc56d2b5c79ba3063d20f76e5347e2e418f6 (diff) | |
| download | linux-9643f5d94aadd47a5fa9754fb60f2c957de05903.tar.xz | |
Merge branch 'for-fsnotify' into for-linus
Diffstat (limited to 'include/linux/magic.h')
| -rw-r--r-- | include/linux/magic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h index 76285e01b39e..eb9800f05782 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h @@ -52,7 +52,6 @@ #define CGROUP_SUPER_MAGIC 0x27e0eb #define FUTEXFS_SUPER_MAGIC 0xBAD1DEA -#define INOTIFYFS_SUPER_MAGIC 0x2BAD1DEA #define STACK_END_MAGIC 0x57AC6E9D |