Pull Kconfig into release branch

diff --combined arch/ia64/Kconfig
index 0f3076a820c3af7dd7c71790be13e212354b3e1a,0046020e73b768103071342a8e4644c4da57006c..f0252eda12a8e08f0c6682e89ff796238e8f7739
--- 1/arch/ia64/Kconfig
--- 2/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -77,6 -77,7 +77,7 @@@ choic
  config IA64_GENERIC
        bool "generic"
        select ACPI
+       select PCI
        select NUMA
        select ACPI_NUMA
        help
@@@ -260,6 -261,15 +261,6 @@@ config NR_CPU
          than 64 will cause the use of a CPU mask array, causing a small
          performance hit.
  
 -config IA64_NR_NODES
 -      int "Maximum number of NODEs (256-1024)" if (IA64_SGI_SN2 || IA64_GENERIC)
 -      range 256 1024
 -      depends on IA64_SGI_SN2 || IA64_GENERIC
 -      default "256"
 -      help
 -        This option specifies the maximum number of nodes in your SSI system.
 -        If in doubt, use the default.
 -
  config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
        depends on SMP && EXPERIMENTAL
@@@ -343,16 -353,6 +344,16 @@@ config NUM
          Access).  This option is for configuring high-end multiprocessor
          server systems.  If in doubt, say N.
  
 +config NODES_SHIFT
 +      int "Max num nodes shift(3-10)"
 +      range 3 10
 +      default "8"
 +      depends on NEED_MULTIPLE_NODES
 +      help
 +        This option specifies the maximum number of nodes in your SSI system.
 +        MAX_NUMNODES will be 2^(This value).
 +        If in doubt, use the default.
 +
  # VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent.
  # VIRTUAL_MEM_MAP has been retained for historical reasons.
  config VIRTUAL_MEM_MAP
@@@ -413,8 -413,6 +414,8 @@@ config IA64_PALINF
  config SGI_SN
        def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
  
 +source "drivers/sn/Kconfig"
 +
  source "drivers/firmware/Kconfig"
  
  source "fs/Kconfig.binfmt"

diff --combined arch/x86_64/Kconfig
index 408d44a59756f8050c4455fdbb471eb9c9881f09,299d8740177af67e24cdbdcead5ea94de8f46a82..6527a368fb9ca786489ec6ce9bb39e935aaf2b37
--- 1/arch/x86_64/Kconfig
--- 2/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@@ -136,11 -136,6 +136,11 @@@ config X86_L1_CACHE_SHIF
        default "7" if GENERIC_CPU || MPSC
        default "6" if MK8
  
 +config X86_INTERNODE_CACHE_BYTES
 +      int
 +      default "4096" if X86_VSMP
 +      default X86_L1_CACHE_BYTES if !X86_VSMP
 +
  config X86_TSC
        bool
        default y
@@@ -288,17 -283,13 +288,18 @@@ config K8_NUM
         Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
         instead, which also takes priority if both are compiled in.   
  
 +config NODES_SHIFT
 +      int
 +      default "6"
 +      depends on NEED_MULTIPLE_NODES
 +
  # Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig.
  
  config X86_64_ACPI_NUMA
         bool "ACPI NUMA detection"
         depends on NUMA
         select ACPI 
+       select PCI
         select ACPI_NUMA
         default y
         help

diff --combined drivers/acpi/Kconfig
index c24652d31bf9b6f2fe763ecd20546fe047729e84,932583da43a55afa9f2a57eb4f7a1fd80550d1f3..2b2fbec14540f8f27d8de0ec5b3b796f226d27c0
--- 1/drivers/acpi/Kconfig
--- 2/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@ -10,9 -10,8 +10,8 @@@ menu "ACPI (Advanced Configuration and 
  config ACPI
        bool "ACPI Support"
        depends on IA64 || X86
+       depends on PCI
        select PM
-       select PCI
- 
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 
@@@ -329,7 -328,7 +328,7 @@@ config ACPI_CONTAINE
  config ACPI_HOTPLUG_MEMORY
        tristate "Memory Hotplug"
        depends on ACPI
 -      depends on MEMORY_HOTPLUG
 +      depends on MEMORY_HOTPLUG || X86_64
        default n
        help
          This driver adds supports for ACPI Memory Hotplug.  This driver