[ACPI] merge 2.4.22 cleanup into 2.6

Restores CONFIG_ACPI_HT_ONLY as an alternative to CONFIG_ACPI
rather than a prerequisite

diff --cc arch/i386/kernel/acpi/boot.c
index 528dfb381b1ccd456254cc35756d8a6043209862,98b355c0bacfde293dee18b45a4dbab85431a225..4ad7874ab76c717fdbc6a4fb1782ced55cc5c8c7
--- 1/arch/i386/kernel/acpi/boot.c
--- 2/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@@ -472,17 -447,14 +470,19 @@@ acpi_boot_init (void
        acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC;
  
        acpi_ioapic = 1;
- #endif /*CONFIG_X86_IO_APIC*/
+ 
++#endif /* CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER */
 +
  #ifdef CONFIG_X86_LOCAL_APIC
        if (acpi_lapic && acpi_ioapic) {
                smp_found_config = 1;
                clustered_apic_check();
        }
  #endif
 -#endif /*CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER*/
++
 +#ifdef CONFIG_HPET_TIMER
 +      acpi_table_parse(ACPI_HPET, acpi_parse_hpet);
 +#endif
  
        return 0;
  }

diff --cc arch/i386/kernel/mpparse.c
Simple merge

diff --cc arch/i386/kernel/setup.c
Simple merge

diff --cc drivers/acpi/Kconfig
index edc45e94669f302b83b0754feefcb9ba0de7bea0,6b9820dd31505ed1eb55a22f11e167917165843c..ccf141ce31d4f15e0cdd2393005ad563b2594a68
--- 1/drivers/acpi/Kconfig
--- 2/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@ -3,34 -3,13 +3,14 @@@
  #
  
  menu "ACPI (Advanced Configuration and Power Interface) Support"
- 
- config ACPI_HT
-       bool "ACPI Processor Enumeration for HT"
-       depends on X86
-       default y
-       ---help---
-         ACPI enumerates both logical (a.k.a. Hyper-Threaded -- HT)
-         and physical processors.  It is designed to obsolete several older
-         specifications, including the MultiProcessor Specification (MPS),
-         which supported only physical processors.
- 
-         CONFIG_ACPI_HT includes the minimal ACPI boot-time code
-         necessary to enumerate logical processors and enable HT.
- 
-         CONFIG_ACPI includes CONFIG_ACPI_HT, plus IO APIC enumeration,
-         and the hooks to run the ACPI AML interpreter for run-time events.
- 
-         When CONFIG_ACPI is selected, the command-line option "acpi=ht"
-         is available to run just the ACPI boot-time code -- just as if
-         only CONFIG_ACPI_HT were selected.
- 
-         Note that "acpi=off" can be used to disable all ACPI code in the kernel.
- 
- config ACPI
-       bool "Full ACPI Support"
        depends on !X86_VISWS
        depends on !IA64_HP_SIM
-       depends on IA64 || (X86 || ACPI_HT)
+       depends on IA64 || X86
+ 
+ config ACPI
+       bool "ACPI Support"
+       depends on IA64 || X86
++
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 
@@@ -68,8 -79,8 +80,9 @@@ config ACPI_INTERPRETE
  config ACPI_SLEEP
        bool "Sleep States (EXPERIMENTAL)"
        depends on X86 && ACPI
 -      depends on EXPERIMENTAL
+       depends on ACPI_INTERPRETER
 +      depends on EXPERIMENTAL && PM
 +      select SOFTWARE_SUSPEND
        default y
        ---help---
          This option adds support for ACPI suspend states.