diff options
| author |   Anton Vorontsov <anton@enomsg.org> | 2013-03-24 20:06:35 -0700 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-24 20:06:35 -0700 |
| commit | 6e997bb894beef128fcfe1679e0830f97dee6dc2 (patch) | |
| tree | 078d95af4d30b5e3d5b1db18de215489b26e01ce /include/linux/kernel.h | |
| parent | s3c-adc-battery: Fix possible NULL pointer dereference (diff) | |
| parent | pm2301_charger: Remove __dev* annotations (diff) | |
Merge branch 'urgent'
Conflicts:
drivers/power/pm2301_charger.c
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 1 |
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; |