Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 8fd2dbf..b75fed7 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1,6 +1,7 @@
 
 config PRINTK_TIME
        bool "Show timing information on printks"
+       depends on PRINTK
        help
          Selecting this option causes timing information to be
          included in printk output.  This allows you to measure
@@ -341,7 +342,7 @@ config FRAME_POINTER
 
 config UNWIND_INFO
        bool "Compile the kernel with frame unwind information"
-       depends on !IA64 && !PARISC
+       depends on !IA64 && !PARISC && !ARM
        depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
        help
          If you say Y here the resulting kernel image will be slightly larger
@@ -373,6 +374,7 @@ config FORCED_INLINING
 
 config HEADERS_CHECK
        bool "Run 'make headers_check' when building vmlinux"
+       depends on !UML
        help
          This option will extract the user-visible kernel headers whenever
          building the kernel, and will run basic sanity checks on them to