summaryrefslogtreecommitdiff
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-15 20:27:12 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-15 20:27:12 +0400
commitcd2d95d97c8d1b66467507400c63d707ddb1deba (patch)
tree7ad5223ba88110ca6735637c9eef327515e9bb96 /include/linux/kernel.h
parent88dd75af0e49e1dabef6f7c7f7f4fa0234b9b988 (diff)
parent41ef2d5678d83af030125550329b6ae8b74618fa (diff)
downloadlinux-cd2d95d97c8d1b66467507400c63d707ddb1deba.tar.xz
Merge tag 'v3.9-rc7' into regulator-fix-core
Linux 3.9-rc7 Trivial context overlap conflicts: MAINTAINERS
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 80d36874689b..79fdd80a42d4 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -390,7 +390,6 @@ extern struct pid *session_of_pgrp(struct pid *pgrp);
unsigned long int_sqrt(unsigned long);
extern void bust_spinlocks(int yes);
-extern void wake_up_klogd(void);
extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */
extern int panic_timeout;
extern int panic_on_oops;