X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fv850%2FKconfig;h=80f5265028f2abaf32c9d52ae10a5607c904204c;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=8665652e24e6c7881e1cc2158b2e69c5df9ca0f9;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 8665652e2..80f526502 100644
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -19,6 +19,9 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
 	bool
 	default n
+config GENERIC_CALIBRATE_DELAY
+	bool
+	default y
 
 # Turn off some random 386 crap that can affect device config
 config ISA
@@ -68,7 +71,6 @@ menu "Processor type and features"
       	     bool "Anna"
    endchoice
 
-
    #### V850E processor-specific config
 
    # All CPUs currently supported use the v850e architecture
@@ -153,7 +155,6 @@ menu "Processor type and features"
    	  bool
 	  default RTE_MB_A_PCI
 
-
    #### Some feature-specific configs
 
    # Everything except for the GDB simulator uses the same interrupt controller
@@ -181,7 +182,6 @@ menu "Processor type and features"
    	  bool
 	  default !V850E_CACHE && !V850E2_CACHE
 
-
    #### Misc config
 
    config ROM_KERNEL
@@ -305,34 +305,9 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "arch/v850/Kconfig.debug"
 
-menu "Kernel hacking"
-
-config DEBUG_KERNEL
-	bool "Kernel debugging"
-
-config DEBUG_INFO
-	bool "Compile the kernel with debug info"
-	depends on DEBUG_KERNEL
-	help
-          If you say Y here the resulting kernel image will include
-	  debugging info resulting in a larger kernel image.
-	  Say Y here only if you plan to use gdb to debug the kernel.
-	  If you don't debug the kernel, you can say N.
-
-config MAGIC_SYSRQ
-	bool "Magic SysRq key"
-	depends on DEBUG_KERNEL
-	help
-	  Enables console device to interprent special characters as
-	  commands to dump state information.
-
-config NO_KERNEL_MSG
-	bool "Suppress Kernel BUG Messages"
-	help
-	  Do not output any debug BUG messages within the kernel.
-
-endmenu
+source "kernel/vserver/Kconfig"
 
 source "security/Kconfig"