diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /include/linux/console.h | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'include/linux/console.h')
| -rw-r--r-- | include/linux/console.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 9774fe6a1a9..7453cfd593c 100644 --- a/include/linux/console.h +++ b/include/linux/console.h | |||
| @@ -139,9 +139,9 @@ extern int update_console_cmdline(char *name, int idx, char *name_new, int idx_n | |||
| 139 | extern void register_console(struct console *); | 139 | extern void register_console(struct console *); |
| 140 | extern int unregister_console(struct console *); | 140 | extern int unregister_console(struct console *); |
| 141 | extern struct console *console_drivers; | 141 | extern struct console *console_drivers; |
| 142 | extern void acquire_console_sem(void); | 142 | extern void console_lock(void); |
| 143 | extern int try_acquire_console_sem(void); | 143 | extern int console_trylock(void); |
| 144 | extern void release_console_sem(void); | 144 | extern void console_unlock(void); |
| 145 | extern void console_conditional_schedule(void); | 145 | extern void console_conditional_schedule(void); |
| 146 | extern void console_unblank(void); | 146 | extern void console_unblank(void); |
| 147 | extern struct tty_driver *console_device(int *); | 147 | extern struct tty_driver *console_device(int *); |