ACPI Config.in update by Christoph Hellwig

- 3 space indents
- one menu for all arches instead of duplicating
- define_*s moved below the real questions

drivers/acpi/Config.in

@@ -2,91 +2,78 @@
 # ACPI Configuration
 #
 
-if [ "$CONFIG_X86" = "y" ]; then
-
-  mainmenu_option next_comment
-  comment 'ACPI Support'
-  bool         'ACPI Support' CONFIG_ACPI
-  if [ "$CONFIG_ACPI" = "y" ]; then
-    if [ "$CONFIG_X86_LOCAL_APIC" = "y" ]; then
-      bool         'CPU Enumeration Only' CONFIG_ACPI_HT_ONLY
-    fi
+mainmenu_option next_comment
+comment 'ACPI Support'
 
-    if [ "$CONFIG_ACPI_HT_ONLY" = "y" ]; then
-      define_bool CONFIG_ACPI_BOOT		y
-    else
-      define_bool CONFIG_ACPI_BOOT		y
-      define_bool CONFIG_ACPI_BUS		y
-      define_bool CONFIG_ACPI_INTERPRETER	y
-      define_bool CONFIG_ACPI_EC		y
-      define_bool CONFIG_ACPI_POWER		y
-      if [ "$CONFIG_PCI" = "y" ]; then
-        define_bool CONFIG_ACPI_PCI		y
-      fi
-      define_bool CONFIG_ACPI_SLEEP		$CONFIG_SOFTWARE_SUSPEND
-      define_bool CONFIG_ACPI_SYSTEM		y
-      tristate     '  AC Adapter'	CONFIG_ACPI_AC
-      tristate     '  Battery'		CONFIG_ACPI_BATTERY
-      tristate     '  Button'		CONFIG_ACPI_BUTTON
-      tristate     '  Fan'		CONFIG_ACPI_FAN
-      tristate     '  Processor'	CONFIG_ACPI_PROCESSOR
-      dep_tristate '  Thermal Zone' 	CONFIG_ACPI_THERMAL $CONFIG_ACPI_PROCESSOR
-      if [ "$CONFIG_NUMA" = "y" ]; then
-         dep_bool       '  NUMA support'     CONFIG_ACPI_NUMA $CONFIG_NUMA
+if [ "$CONFIG_X86" = "y" ]; then
+   bool 'ACPI Support' CONFIG_ACPI
+   if [ "$CONFIG_ACPI" = "y" ]; then
+      if [ "$CONFIG_X86_LOCAL_APIC" = "y" ]; then
+         bool         'CPU Enumeration Only' CONFIG_ACPI_HT_ONLY
       fi
-      tristate     '  Toshiba Laptop Extras'	CONFIG_ACPI_TOSHIBA
-      bool         '  Debug Statements'	CONFIG_ACPI_DEBUG
-    fi
-  fi
 
-  endmenu
+      define_bool CONFIG_ACPI_BOOT y
 
-fi
+      if [ "$CONFIG_ACPI_HT_ONLY" != "y" ]; then
+         tristate '  AC Adapter' CONFIG_ACPI_AC
+         tristate '  Battery' CONFIG_ACPI_BATTERY
+         tristate '  Button' CONFIG_ACPI_BUTTON
+         tristate '  Fan' CONFIG_ACPI_FAN
+         tristate '  Processor'	CONFIG_ACPI_PROCESSOR
+         dep_tristate '  Thermal Zone' CONFIG_ACPI_THERMAL $CONFIG_ACPI_PROCESSOR
+         if [ "$CONFIG_NUMA" = "y" ]; then
+            dep_bool '  NUMA support' CONFIG_ACPI_NUMA $CONFIG_NUMA
+         fi
+         tristate '  Toshiba Laptop Extras' CONFIG_ACPI_TOSHIBA
+         bool '  Debug Statements' CONFIG_ACPI_DEBUG
 
+         define_bool CONFIG_ACPI_BOOT y
+         define_bool CONFIG_ACPI_BUS y
+         define_bool CONFIG_ACPI_INTERPRETER y
+         define_bool CONFIG_ACPI_EC y
+         define_bool CONFIG_ACPI_POWER y
+         define_bool CONFIG_ACPI_PCI $CONFIG_PCI
+         define_bool CONFIG_ACPI_SLEEP $CONFIG_SOFTWARE_SUSPEND
+         define_bool CONFIG_ACPI_SYSTEM	y
+      fi
+   fi
+fi
 
 if [ "$CONFIG_IA64" = "y" ]; then
+   if [ "$CONFIG_IA64_SGI_SN" = "y" ]; then
+      define_bool CONFIG_ACPI y
+      define_bool CONFIG_ACPI_EFI y
+      define_bool CONFIG_ACPI_BOOT y
+      define_bool CONFIG_ACPI_BUS n
+      define_bool CONFIG_ACPI_INTERPRETER n
+      define_bool CONFIG_ACPI_PCI n
+      define_bool CONFIG_ACPI_POWER n
+      define_bool CONFIG_ACPI_SYSTEM n
+      define_bool CONFIG_ACPI_BUTTON n
+      define_bool CONFIG_ACPI_FAN n
+      define_bool CONFIG_ACPI_PROCESSOR n
+      define_bool CONFIG_ACPI_THERMAL n
+      define_bool CONFIG_ACPI_NUMA y
+   fi
 
-  if [ "$CONFIG_IA64_SGI_SN" = "y" ]; then
-    mainmenu_option next_comment
-    comment 'ACPI Support'
-    define_bool CONFIG_ACPI		y
-    define_bool CONFIG_ACPI_EFI		y
-    define_bool CONFIG_ACPI_BOOT	y
-    define_bool CONFIG_ACPI_BUS		n
-    define_bool CONFIG_ACPI_INTERPRETER n
-    define_bool CONFIG_ACPI_PCI		n
-    define_bool CONFIG_ACPI_POWER 	n
-    define_bool CONFIG_ACPI_SYSTEM 	n
-    define_bool CONFIG_ACPI_BUTTON	n
-    define_bool CONFIG_ACPI_FAN		n
-    define_bool CONFIG_ACPI_PROCESSOR	n
-    define_bool CONFIG_ACPI_THERMAL	n
-    define_bool CONFIG_ACPI_NUMA	y
-    endmenu
-  fi
-
-  if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
-    mainmenu_option next_comment
-    comment 'ACPI Support'
-    if [ "$CONFIG_PCI" = "y" ]; then
-      define_bool CONFIG_ACPI_PCI 	y
-    fi
-    define_bool CONFIG_ACPI		y
-    define_bool CONFIG_ACPI_EFI		y
-    define_bool CONFIG_ACPI_BOOT	y
-    define_bool CONFIG_ACPI_BUS		y
-    define_bool CONFIG_ACPI_INTERPRETER y
-    define_bool CONFIG_ACPI_POWER 	y
-    define_bool CONFIG_ACPI_SYSTEM 	y
-    tristate     '  Button'		CONFIG_ACPI_BUTTON
-    tristate     '  Fan'		CONFIG_ACPI_FAN
-    tristate     '  Processor'		CONFIG_ACPI_PROCESSOR
-    dep_tristate '  Thermal Zone'       CONFIG_ACPI_THERMAL $CONFIG_ACPI_PROCESSOR
-    if [ "$CONFIG_NUMA" = "y" ]; then
-       dep_bool       '  NUMA support'       CONFIG_ACPI_NUMA $CONFIG_NUMA
-    fi
-    bool         '  Debug Statements' 	CONFIG_ACPI_DEBUG
-    endmenu
-  fi
-
+   if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
+      tristate     '  Button' CONFIG_ACPI_BUTTON
+      tristate     '  Fan' CONFIG_ACPI_FAN
+      tristate     '  Processor' CONFIG_ACPI_PROCESSOR
+      dep_tristate '  Thermal Zone' CONFIG_ACPI_THERMAL $CONFIG_ACPI_PROCESSOR
+      if [ "$CONFIG_NUMA" = "y" ]; then
+         dep_bool '  NUMA support' CONFIG_ACPI_NUMA $CONFIG_NUMA
+      fi
+      bool '  Debug Statements' CONFIG_ACPI_DEBUG
+      define_bool CONFIG_ACPI_PCI $CONFIG_PCI
+      define_bool CONFIG_ACPI y
+      define_bool CONFIG_ACPI_EFI y
+      define_bool CONFIG_ACPI_BOOT y
+      define_bool CONFIG_ACPI_BUS y
+      define_bool CONFIG_ACPI_INTERPRETER y
+      define_bool CONFIG_ACPI_POWER y
+      define_bool CONFIG_ACPI_SYSTEM y
+   fi
 fi
+
+endmenu