diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-09-24 11:13:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 11:13:19 -0400 |
| commit | e18fa700c9a31360bc8f193aa543b7ef7b39a06b (patch) | |
| tree | 1006f53177341c614d4aeb6c96e2e8f3859b5f52 /fs/autofs | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
| download | linux-dev-e18fa700c9a31360bc8f193aa543b7ef7b39a06b.tar.xz linux-dev-e18fa700c9a31360bc8f193aa543b7ef7b39a06b.zip | |
Move several *_SUPER_MAGIC symbols to include/linux/magic.h.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'fs/autofs')
| -rw-r--r-- | fs/autofs/autofs_i.h | 2 | ||||
| -rw-r--r-- | fs/autofs/inode.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h index a62327f1bdff..c7700d9b3f96 100644 --- a/fs/autofs/autofs_i.h +++ b/fs/autofs/autofs_i.h @@ -37,8 +37,6 @@ #define DPRINTK(D) ((void)0) #endif -#define AUTOFS_SUPER_MAGIC 0x0187 - /* * If the daemon returns a negative response (AUTOFS_IOC_FAIL) then the * kernel will keep the negative response cached for up to the time given diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c index 65e5ed42190e..af2efbbb5d76 100644 --- a/fs/autofs/inode.c +++ b/fs/autofs/inode.c @@ -16,6 +16,7 @@ #include <linux/file.h> #include <linux/parser.h> #include <linux/bitops.h> +#include <linux/magic.h> #include "autofs_i.h" #include <linux/module.h> |