From 7f14b41be1251411ff3211562f95f6b725331e51 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 19 Jan 2011 20:43:56 +0100
Subject: [PATCH] --- yaml --- r: 232131 b: refs/heads/master c:
 373b25c3bff14fd9ed30b6ddba49cbeeb7ccdf88 h: refs/heads/master i:   232129:
 803707077e901e2b98a78a6a460c9664f7f421d2   232127:
 b9363e85b5a2c9568b4ad7faf9686969ec66cb9b v: v3

---
 [refs]                   | 2 +-
 trunk/arch/sparc/Kconfig | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ae4aed2fbeb5..68f975d0aef9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fc361bfcfce4fd05eb3d2e3d400dd387a5724c4
+refs/heads/master: 373b25c3bff14fd9ed30b6ddba49cbeeb7ccdf88
diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
index 989bb6415ea3..95695e97703e 100644
--- a/trunk/arch/sparc/Kconfig
+++ b/trunk/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
@@ -272,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