X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc64%2FKconfig;h=e9431d81a3446ba010eb48edd0412c1895d6695b;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=8d5e077fd27d6701f278b88cd1b30189ca405f55;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 8d5e077fd..e9431d81a 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -198,7 +198,6 @@ config SCHED_SMT
 
 config PREEMPT
 	bool "Preemptible Kernel"
-	depends on BROKEN
 	help
 	  This option reduces the latency of the kernel when reacting to
 	  real-time or interactive events by allowing a low priority process to
@@ -226,7 +225,7 @@ config SCANLOG
 	depends on PPC_RTAS
 
 config LPARCFG
-	bool "LPAR Configuration Data"
+	tristate "LPAR Configuration Data"
 	help
 	Provide system capacity information via human readable 
 	<key word>=<value> pairs through a /proc/ppc64/lparcfg interface.
@@ -425,8 +424,6 @@ config IRQSTACKS
 	  for handling hard and soft interrupts.  This can help avoid
 	  overflowing the process kernel stacks.
 	  
-endmenu
-
 config SPINLINE
 	bool "Inline spinlock code at each call site"
 	depends on SMP && !PPC_SPLPAR && !PPC_ISERIES
@@ -437,6 +434,8 @@ config SPINLINE
 
 	  If in doubt, say N.
 
+endmenu
+
 source "kernel/vserver/Kconfig"
 
 source "security/Kconfig"