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

1 files changed, 21 insertions, 0 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 338d82aeda67..d920baed109a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -275,6 +275,27 @@ config KALLSYMS_EXTRA_PASS
            reported.  KALLSYMS_EXTRA_PASS is only a temporary workaround while
            you wait for kallsyms to be fixed.
 
+
+config PRINTK
+        default y
+        bool "Enable support for printk" if EMBEDDED
+        help
+          This option enables normal printk support. Removing it
+          eliminates most of the message strings from the kernel image
+          and makes the kernel more or less silent. As this makes it
+          very difficult to diagnose system problems, saying N here is
+          strongly discouraged.
+
+config BUG
+        bool "BUG() support" if EMBEDDED
+        default y
+        help
+          Disabling this option eliminates support for BUG and WARN, reducing
+          the size of your kernel image and potentially quietly ignoring
+          numerous fatal conditions. You should only consider disabling this
+          option for embedded systems with no facilities for reporting errors.
+          Just say Y.
+
 config BASE_FULL
         default y
         bool "Enable full-sized data structures for core" if EMBEDDED