Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[deliverable/linux.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 8fd2dbf7eb5b411053ad697b493012e42dcf678c..d3679103a8e4eff9baafdfd30f41e9f28aefe7ef 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -341,7 +341,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 +373,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