diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 17:13:19 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 17:13:19 +0200 |
commit | e18fa700c9a31360bc8f193aa543b7ef7b39a06b (patch) | |
tree | 1006f53177341c614d4aeb6c96e2e8f3859b5f52 /fs/affs | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
download | linux-e18fa700c9a31360bc8f193aa543b7ef7b39a06b.tar.xz linux-e18fa700c9a31360bc8f193aa543b7ef7b39a06b.zip |
Move several *_SUPER_MAGIC symbols to include/linux/magic.h.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'fs/affs')
-rw-r--r-- | fs/affs/affs.h | 1 | ||||
-rw-r--r-- | fs/affs/super.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/affs/affs.h b/fs/affs/affs.h index 0ddd4cc0d1a0..1dc8438ef389 100644 --- a/fs/affs/affs.h +++ b/fs/affs/affs.h @@ -1,7 +1,6 @@ #include <linux/types.h> #include <linux/fs.h> #include <linux/buffer_head.h> -#include <linux/affs_fs.h> #include <linux/amigaffs.h> /* AmigaOS allows file names with up to 30 characters length. diff --git a/fs/affs/super.c b/fs/affs/super.c index 5200f4938df0..17352011ab67 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/statfs.h> #include <linux/parser.h> +#include <linux/magic.h> #include "affs.h" extern struct timezone sys_tz; |