revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / include / linux / msdos_fs.h

diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
index f38d4f0a5ae8d2ac1db244411f843967d4da8b12..34066e65fdeb327b4da8e0fd58e4dc143d985fc4 100644 (file)
--- a/include/linux/msdos_fs.h
+++ b/include/linux/msdos_fs.h
@@ -101,7 +101,6 @@ struct __fat_dirent {
 /* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */
 #define FAT_IOCTL_GET_ATTRIBUTES       _IOR('r', 0x10, __u32)
 #define FAT_IOCTL_SET_ATTRIBUTES       _IOW('r', 0x11, __u32)
-#define VFAT_IOCTL_GET_VOLUME_ID       _IOR('r', 0x12, __u32)
 
 struct fat_boot_sector {
        __u8    ignored[3];     /* Boot strap short or near jump */
@@ -139,17 +138,6 @@ struct fat_boot_fsinfo {
        __le32   reserved2[4];
 };
 
-struct fat_boot_bsx {
-       __u8     drive;             /* drive number */
-       __u8     reserved1;
-       __u8     signature;         /* extended boot signature */
-       __u8     vol_id[4];     /* volume ID */
-       __u8     vol_label[11]; /* volume label */
-       __u8     type[8];       /* file system type */
-};
-#define FAT16_BSX_OFFSET       36 /* offset of fat_boot_bsx in FAT12 and FAT16 */
-#define FAT32_BSX_OFFSET       64 /* offset of fat_boot_bsx in FAT32 */
-
 struct msdos_dir_entry {
        __u8    name[MSDOS_NAME];/* name and extension */
        __u8    attr;           /* attribute bits */