diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-20 18:06:15 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-20 18:06:15 -0400 |
commit | d1a7fddf420b1f5a7d9a899b3388026084a67d33 (patch) | |
tree | 7044a8b9a1b6fadc7b027d4a82840c084b0c8012 /include/linux/kernel.h | |
parent | 778c4c821779bb7eef7f5a1eea4d15d05d976f8b (diff) | |
parent | c0e1936338a11ea252d11370ff62e40db334f646 (diff) |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 6803318fa2ea..5a566b705ca9 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -265,6 +265,7 @@ extern enum system_states { | |||
265 | #define TAINT_DIE 7 | 265 | #define TAINT_DIE 7 |
266 | #define TAINT_OVERRIDDEN_ACPI_TABLE 8 | 266 | #define TAINT_OVERRIDDEN_ACPI_TABLE 8 |
267 | #define TAINT_WARN 9 | 267 | #define TAINT_WARN 9 |
268 | #define TAINT_CRAP 10 | ||
268 | 269 | ||
269 | extern void dump_stack(void) __cold; | 270 | extern void dump_stack(void) __cold; |
270 | 271 | ||