Pull release into acpica branch

[linux-2.6] / include / linux / kernel.h

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index f1925ccc9fe1696496cdad0f9f2bcf583bf2eb5c..b1e407a4fbda1ec9b101c5e0bd2c3c4378b7bb5b 100644 (file)
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -168,7 +168,7 @@ static inline void console_verbose(void)
 
 extern void bust_spinlocks(int yes);
 extern int oops_in_progress;           /* If set, an oops, panic(), BUG() or die() is in progress */
-extern int panic_timeout;
+extern __deprecated_for_modules int panic_timeout;
 extern int panic_on_oops;
 extern int tainted;
 extern const char *print_tainted(void);
@@ -266,7 +266,6 @@ extern void dump_stack(void);
 
 /**
  * container_of - cast a member of a structure out to the containing structure
- *
  * @ptr:       the pointer to the member.
  * @type:      the type of the container struct this is embedded in.
  * @member:    the name of the member within the struct.