---

yaml --- r: 232131 b: refs/heads/master c: 373b25c h: refs/heads/master i: 232129: 8037070 232127: b9363e8 v: v3
git-mirror · Jan 21, 2011 · 7f14b41 · 7f14b41
1 parent 97e891e
commit 7f14b41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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