Merge commit 'v2.6.38-rc2' into topic/misc

1 files changed, 1 insertions, 8 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 45d9c87d083a..95695e97703e 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -50,6 +50,7 @@ config SPARC64
         select RTC_DRV_STARFIRE
         select HAVE_PERF_EVENTS
         select PERF_USE_VMALLOC
+        select HAVE_GENERIC_HARDIRQS
 
 config ARCH_DEFCONFIG
         string
@@ -107,10 +108,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK
 config NEED_PER_CPU_PAGE_FIRST_CHUNK
         def_bool y if SPARC64
 
-config GENERIC_HARDIRQS_NO__DO_IRQ
-        bool
-        def_bool y if SPARC64
-
 config MMU
         bool
         default y
@@ -276,10 +273,6 @@ config HOTPLUG_CPU
           can be controlled through /sys/devices/system/cpu/cpu#.
           Say N if you want to disable CPU hotplug.
 
-config GENERIC_HARDIRQS
-        bool
-        default y if SPARC64
-
 source "kernel/time/Kconfig"
 
 if SPARC64