Merge linux-2.6 with linux-acpi-2.6

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 40242c61e90a..e63323e03ea9 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -24,6 +24,10 @@ config X86
         bool
         default y
 
+config SEMAPHORE_SLEEPERS
+        bool
+        default y
+
 config MMU
         bool
         default y
@@ -61,6 +65,10 @@ config GENERIC_IOMAP
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 source "init/Kconfig"
 
 
@@ -436,6 +444,11 @@ config ISA_DMA_API
         bool
         default y
 
+config GENERIC_PENDING_IRQ
+        bool
+        depends on GENERIC_HARDIRQS && SMP
+        default y
+
 menu "Power management options"
 
 source kernel/power/Kconfig