Merge with Linux 2.3.38.

1 files changed, 51 insertions, 53 deletions

diff --git a/fs/partitions/Config.in b/fs/partitions/Config.in
index de35b3d57..869dcb76d 100644
--- a/fs/partitions/Config.in
+++ b/fs/partitions/Config.in
@@ -3,64 +3,62 @@
 #
 bool 'Advanced partition selection' CONFIG_PARTITION_ADVANCED
 if [ "$CONFIG_PARTITION_ADVANCED" = "y" ]; then
-  bool 'Alpha OSF partition support' CONFIG_OSF_PARTITION
-  bool 'Macintosh partition map support' CONFIG_MAC_PARTITION
-  bool 'PC BIOS (MSDOS partition tables) support' CONFIG_MSDOS_PARTITION
+   bool '  Acorn partition support' CONFIG_ACORN_PARTITION
+   if [ "$CONFIG_ACORN_PARTITION" != "n" ]; then
+#      bool '    Cumana partition support' CONFIG_ACORN_PARTITION_CUMANA
+      bool '    ICS partition support' CONFIG_ACORN_PARTITION_ICS
+      bool '    Native filecore partition support' CONFIG_ACORN_PARTITION_ADFS
+      bool '    PowerTec partition support' CONFIG_ACORN_PARTITION_POWERTEC
+      bool '    RISCiX partition support' CONFIG_ACORN_PARTITION_RISCIX
+   fi
+   bool '  Alpha OSF partition support' CONFIG_OSF_PARTITION
+   bool '  Amiga partition table support' CONFIG_AMIGA_PARTITION
+   bool '  Atari partition table support' CONFIG_ATARI_PARTITION
+   bool '  Macintosh partition map support' CONFIG_MAC_PARTITION
+   bool '  PC BIOS (MSDOS partition tables) support' CONFIG_MSDOS_PARTITION
+   if [ "$CONFIG_MSDOS_PARTITION" = "y" ]; then
+      bool '    BSD disklabel (FreeBSD partition tables) support' CONFIG_BSD_DISKLABEL
+      bool '    Solaris (x86) partition table support' CONFIG_SOLARIS_X86_PARTITION
+      bool '    Unixware slices support' CONFIG_UNIXWARE_DISKLABEL
+   fi
 else
-  if [ "$ARCH" = "alpha" ]; then
-    define_bool CONFIG_OSF_PARTITION y
-  fi
-  if [ "$ARCH" = "ppc" -o "$CONFIG_MAC" = "y" ]; then
-    define_bool CONFIG_MAC_PARTITION y
-  fi
-  if [ "$CONFIG_AMIGA" != "y" -a "$CONFIG_ATARI" != "y" -a \
-       "$CONFIG_MAC" != "y" ]; then
-    define_bool CONFIG_MSDOS_PARTITION y
-  fi
+   if [ "$ARCH" = "alpha" ]; then
+      define_bool CONFIG_OSF_PARTITION y
+   fi
+   if [ "$ARCH" = "ppc" -o "$CONFIG_MAC" = "y" ]; then
+      define_bool CONFIG_MAC_PARTITION y
+   fi
+   if [ "$CONFIG_AMIGA" != "y" -a "$CONFIG_ATARI" != "y" -a \
+        "$CONFIG_MAC" != "y" ]; then
+      define_bool CONFIG_MSDOS_PARTITION y
+   fi
+   if [ "$CONFIG_AMIGA" = "y" ]; then
+      define_bool CONFIG_AMIGA_PARTITION y
+   fi
+   if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
+      define_bool CONFIG_ACORN_PARTITION y
+      define_bool CONFIG_ACORN_PARTITION_ADFS y
+#      define_bool CONFIG_ACORN_PARTITION_CUMANA y
+      define_bool CONFIG_ACORN_PARTITION_ICS y
+      define_bool CONFIG_ACORN_PARTITION_POWERTEC y
+      define_bool CONFIG_ACORN_PARTITION_RISCIX y
+   fi
+   if [ "$CONFIG_ATARI" = "y" ]; then
+      define_bool CONFIG_ATARI_PARTITION y
+   fi
 fi
-if [ "$CONFIG_PARTITION_ADVANCED" = "y" -a \
-     "$CONFIG_MSDOS_PARTITION" = "y" ]; then
-  bool '  BSD disklabel (FreeBSD partition tables) support' CONFIG_BSD_DISKLABEL
-  bool '  Solaris (x86) partition table support' CONFIG_SOLARIS_X86_PARTITION
-  bool '  Unixware slices support' CONFIG_UNIXWARE_DISKLABEL
-fi
-if [ "$CONFIG_SGI_IP22" != "y" ]; then
-  bool 'SGI partition support' CONFIG_SGI_PARTITION
+if [ "$CONFIG_SGI_IP22" != "y" -a "$CONFIG_SGI_IP27" != "y" ]; then
+   bool 'SGI partition support' CONFIG_SGI_PARTITION
 else
-  define_bool CONFIG_SGI_PARTITION y
-fi
-if [ "$CONFIG_PARTITION_ADVANCED" = "y" ]; then
-  bool 'Ultrix partition table support' CONFIG_ULTRIX_PARTITION
+   define_bool CONFIG_SGI_PARTITION y
 fi
-if [ "$ARCH" != "sparc" -a "$ARCH" != "sparc64" ]; then
-  bool 'Sun partition tables support' CONFIG_SUN_PARTITION
+if [ "$CONFIG_DECSTATION" != "y" ]; then
+   bool 'Ultrix partition table support' CONFIG_ULTRIX_PARTITION
 else
-  define_bool CONFIG_SUN_PARTITION y
+   define_bool CONFIG_ULTRIX_PARTITION y
 fi
-if [ "$CONFIG_PARTITION_ADVANCED" = "y" ]; then
-  bool 'Amiga partition table support' CONFIG_AMIGA_PARTITION
-  bool 'Atari partition table support' CONFIG_ATARI_PARTITION
-  bool 'Acorn partition support' CONFIG_ACORN_PARTITION
-  if [ "$CONFIG_ACORN_PARTITION" != "n" ]; then
-    bool '  Native filecore partition support' CONFIG_ACORN_PARTITION_ADFS
-#    bool '  Cumana partition support' CONFIG_ACORN_PARTITION_CUMANA
-    bool '  ICS partition support' CONFIG_ACORN_PARTITION_ICS
-    bool '  PowerTec partition support' CONFIG_ACORN_PARTITION_POWERTEC
-    bool '  RISCiX partition support' CONFIG_ACORN_PARTITION_RISCIX
-  fi
+if [ "$ARCH" != "sparc" -a "$ARCH" != "sparc64" ]; then
+   bool 'Sun partition tables support' CONFIG_SUN_PARTITION
 else
-  if [ "$CONFIG_AMIGA" = "y" ]; then
-    define_bool CONFIG_AMIGA_PARTITION y
-  fi
-  if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
-    define_bool CONFIG_ACORN_PARTITION y
-    define_bool CONFIG_ACORN_PARTITION_ADFS y
-#    define_bool CONFIG_ACORN_PARTITION_CUMANA y
-    define_bool CONFIG_ACORN_PARTITION_ICS y
-    define_bool CONFIG_ACORN_PARTITION_POWERTEC y
-    define_bool CONFIG_ACORN_PARTITION_RISCIX y
-  fi
-fi
-if [ "$CONFIG_ATARI" = "y" ]; then
-  define_bool CONFIG_ATARI_PARTITION y
+   define_bool CONFIG_SUN_PARTITION y
 fi