aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-10 21:57:15 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-10 21:57:15 -0500
commit29afc4e9a408f2304e09c6dd0dbcfbd2356d0faa (patch)
treeb4065a69fc2baa5f721b9e3ca05e3934e1ea6693 /include/uapi/linux
parent1d9c5d79e6e4385aea6f69c23ba543717434ed70 (diff)
parentedb0ec0725bb9797ded0deaf172a6795e43795c8 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree changes from Jiri Kosina: "Patches from trivial.git that keep the world turning around. Mostly documentation and comment fixes, and a two corner-case code fixes from Alan Cox" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: kexec, Kconfig: spell "architecture" properly mm: fix cleancache debugfs directory path blackfin: mach-common: ints-priority: remove unused function doubletalk: probe failure causes OOPS ARM: cache-l2x0.c: Make it clear that cache-l2x0 handles L310 cache controller msdos_fs.h: fix 'fields' in comment scsi: aic7xxx: fix comment ARM: l2c: fix comment ibmraid: fix writeable attribute with no store method dynamic_debug: fix comment doc: usbmon: fix spelling s/unpriviledged/unprivileged/ x86: init_mem_mapping(): use capital BIOS in comment
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/msdos_fs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/msdos_fs.h b/include/uapi/linux/msdos_fs.h
index e284ff919d6e..e956704f5fb1 100644
--- a/include/uapi/linux/msdos_fs.h
+++ b/include/uapi/linux/msdos_fs.h
@@ -134,7 +134,7 @@ struct fat_boot_sector {
134 __u8 vol_id[4]; /* volume ID */ 134 __u8 vol_id[4]; /* volume ID */
135 __u8 vol_label[11]; /* volume label */ 135 __u8 vol_label[11]; /* volume label */
136 __u8 fs_type[8]; /* file system type */ 136 __u8 fs_type[8]; /* file system type */
137 /* other fiealds are not added here */ 137 /* other fields are not added here */
138 } fat16; 138 } fat16;
139 139
140 struct { 140 struct {
@@ -157,7 +157,7 @@ struct fat_boot_sector {
157 __u8 vol_id[4]; /* volume ID */ 157 __u8 vol_id[4]; /* volume ID */
158 __u8 vol_label[11]; /* volume label */ 158 __u8 vol_label[11]; /* volume label */
159 __u8 fs_type[8]; /* file system type */ 159 __u8 fs_type[8]; /* file system type */
160 /* other fiealds are not added here */ 160 /* other fields are not added here */
161 } fat32; 161 } fat32;
162 }; 162 };
163}; 163};