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

[linux-2.6-omap-h63xx.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index f290e8e866f65a636c324acfccc69954c2968bd1..bda561ef3cdf4e3f7f091fc6f4f215fe4b785b16 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -161,6 +161,7 @@ static const struct tnt tnts[] = {
        { TAINT_DIE, 'D', ' ' },
        { TAINT_OVERRIDDEN_ACPI_TABLE, 'A', ' ' },
        { TAINT_WARN, 'W', ' ' },
+       { TAINT_CRAP, 'C', ' ' },
 };
 
 /**
@@ -175,6 +176,7 @@ static const struct tnt tnts[] = {
  *  'U' - Userspace-defined naughtiness.
  *  'A' - ACPI table overridden.
  *  'W' - Taint on warning.
+ *  'C' - modules from drivers/staging are loaded.
  *
  *     The string is overwritten by the next call to print_taint().
  */