Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[pandora-kernel.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 95c36c4..140e254 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -64,8 +64,12 @@ config X86
        select HAVE_TEXT_POKE_SMP
        select HAVE_GENERIC_HARDIRQS
        select HAVE_SPARSE_IRQ
+       select GENERIC_FIND_FIRST_BIT
+       select GENERIC_FIND_NEXT_BIT
        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
+       select GENERIC_IRQ_SHOW
+       select IRQ_FORCED_THREADING
        select USE_GENERIC_SMP_HELPERS if SMP
 
 config INSTRUCTION_DECODER
@@ -119,7 +123,7 @@ config NEED_SG_DMA_LENGTH
        def_bool y
 
 config GENERIC_ISA_DMA
-       def_bool y
+       def_bool ISA_DMA_API
 
 config GENERIC_IOMAP
        def_bool y
@@ -139,7 +143,7 @@ config GENERIC_GPIO
        bool
 
 config ARCH_MAY_HAVE_PC_FDC
-       def_bool y
+       def_bool ISA_DMA_API
 
 config RWSEM_GENERIC_SPINLOCK
        def_bool !X86_XADD
@@ -217,10 +221,6 @@ config X86_HT
        def_bool y
        depends on SMP
 
-config X86_TRAMPOLINE
-       def_bool y
-       depends on SMP || (64BIT && ACPI_SLEEP)
-
 config X86_32_LAZY_GS
        def_bool y
        depends on X86_32 && !CC_STACKPROTECTOR
@@ -382,6 +382,8 @@ config X86_INTEL_CE
        depends on X86_32
        depends on X86_EXTENDED_PLATFORM
        select X86_REBOOTFIXUPS
+       select OF
+       select OF_EARLY_FLATTREE
        ---help---
          Select for the Intel CE media processor (CE4100) SOC.
          This option compiles in support for the CE4100 SOC for settop
@@ -811,7 +813,7 @@ config X86_LOCAL_APIC
 
 config X86_IO_APIC
        def_bool y
-       depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC
+       depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC
 
 config X86_VISWS_APIC
        def_bool y
@@ -2000,9 +2002,13 @@ source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"
 
-# x86_64 have no ISA slots, but do have ISA-style DMA.
+# x86_64 have no ISA slots, but can have ISA-style DMA.
 config ISA_DMA_API
-       def_bool y
+       bool "ISA-style DMA support" if (X86_64 && EXPERT)
+       default y
+       help
+         Enables ISA-style DMA support for devices requiring such controllers.
+         If unsure, say Y.
 
 if X86_32
 
@@ -2066,9 +2072,10 @@ config SCx200HR_TIMER
 
 config OLPC
        bool "One Laptop Per Child support"
+       depends on !X86_PAE
        select GPIOLIB
-       select OLPC_OPENFIRMWARE
-       depends on !X86_64 && !X86_PAE
+       select OF
+       select OF_PROMTREE if PROC_DEVICETREE
        ---help---
          Add support for detecting the unique features of the OLPC
          XO hardware.
@@ -2079,21 +2086,6 @@ config OLPC_XO1
        ---help---
          Add support for non-essential features of the OLPC XO-1 laptop.
 
-config OLPC_OPENFIRMWARE
-       bool "Support for OLPC's Open Firmware"
-       depends on !X86_64 && !X86_PAE
-       default n
-       select OF
-       help
-         This option adds support for the implementation of Open Firmware
-         that is used on the OLPC XO-1 Children's Machine.
-         If unsure, say N here.
-
-config OLPC_OPENFIRMWARE_DT
-       bool
-       default y if OLPC_OPENFIRMWARE && PROC_DEVICETREE
-       select OF_PROMTREE
-
 endif # X86_32
 
 config AMD_NB
@@ -2104,6 +2096,16 @@ source "drivers/pcmcia/Kconfig"
 
 source "drivers/pci/hotplug/Kconfig"
 
+config RAPIDIO
+       bool "RapidIO support"
+       depends on PCI
+       default n
+       help
+         If you say Y here, the kernel will include drivers and
+         infrastructure code to support RapidIO interconnect devices.
+
+source "drivers/rapidio/Kconfig"
+
 endmenu
 
 
@@ -2138,6 +2140,11 @@ config SYSVIPC_COMPAT
        def_bool y
        depends on COMPAT && SYSVIPC
 
+config KEYS_COMPAT
+       bool
+       depends on COMPAT && KEYS
+       default y
+
 endmenu