diff options
author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
---|---|---|
committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
tree | 6067ea700202750ba335a423696f2972700e5f76 /include/linux/msdos_fs.h | |
parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'include/linux/msdos_fs.h')
-rw-r--r-- | include/linux/msdos_fs.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h index fb17117a0..dba07c796 100644 --- a/include/linux/msdos_fs.h +++ b/include/linux/msdos_fs.h @@ -7,7 +7,6 @@ #include <linux/fs.h> #include <linux/stat.h> #include <linux/fd.h> -#include <linux/config.h> #include <asm/byteorder.h> @@ -72,13 +71,9 @@ #define MSDOS_FAT12 4078 /* maximum number of clusters in a 12 bit FAT */ -#ifdef CONFIG_ATARI -#define EOF_FAT12 0xFFF /* Atari GEMDOS fs uses a different EOF */ -#define EOF_FAT16 0xFFFF -#else #define EOF_FAT12 0xFF8 /* standard EOF */ #define EOF_FAT16 0xFFF8 -#endif +#define EOF_FAT(s) (MSDOS_SB(s)->fat_bits == 16 ? 0xFFF8 : 0xFF8) /* * Inode flags |