Merge with Linux 2.1.67.

1 files changed, 23 insertions, 20 deletions

diff --git a/include/linux/iso_fs_sb.h b/include/linux/iso_fs_sb.h
index 25ebdb8ab..35bd29203 100644
--- a/include/linux/iso_fs_sb.h
+++ b/include/linux/iso_fs_sb.h
@@ -5,26 +5,29 @@
  * iso9660 super-block data in memory
  */
 struct isofs_sb_info {
-			unsigned long s_ninodes;
-			unsigned long s_nzones;
-			unsigned long s_firstdatazone;
-			unsigned long s_log_zone_size;
-			unsigned long s_max_size;
-
-			unsigned char s_high_sierra; /* A simple flag */
-			unsigned char s_mapping;
-			unsigned char s_conversion;
-			unsigned char s_rock;
-			unsigned char s_name_check; /* r = relaxed, s = strict */
-			unsigned char s_cruft; /* Broken disks with high
-						  byte of length containing
-						  junk */
-			unsigned char s_unhide;
-			unsigned char s_nosuid;
-			unsigned char s_nodev;
-			mode_t s_mode;
-			gid_t s_gid;
-			uid_t s_uid;
+	unsigned long s_ninodes;
+	unsigned long s_nzones;
+	unsigned long s_firstdatazone;
+	unsigned long s_log_zone_size;
+	unsigned long s_max_size;
+	
+	unsigned char s_high_sierra; /* A simple flag */
+	unsigned char s_mapping;
+	unsigned char s_conversion;
+	unsigned char s_rock;
+	unsigned char s_joliet_level;
+	unsigned char s_utf8;
+	unsigned char s_name_check; /* r = relaxed, s = strict */
+	unsigned char s_cruft; /* Broken disks with high
+				  byte of length containing
+				  junk */
+	unsigned char s_unhide;
+	unsigned char s_nosuid;
+	unsigned char s_nodev;
+	mode_t s_mode;
+	gid_t s_gid;
+	uid_t s_uid;
+	struct nls_table *s_nls_iocharset; /* Native language support table */
 };
 
 #endif