diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
| commit | ef2e58ea6b9931c3a4816c66593da49bb20e3b24 (patch) | |
| tree | ce7432add3becbe78de4ea06425cd2d9e91f4ada /include/linux/kbd_kern.h | |
| parent | 06d63cc51d47f572009138a7f3ac34d95773405d (diff) | |
| parent | de46c33745f5e2ad594c72f2cf5f490861b16ce1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/kbd_kern.h')
| -rw-r--r-- | include/linux/kbd_kern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h index 06c58c423fe1..506ad20c18f8 100644 --- a/include/linux/kbd_kern.h +++ b/include/linux/kbd_kern.h | |||
| @@ -75,7 +75,7 @@ extern int do_poke_blanked_console; | |||
| 75 | 75 | ||
| 76 | extern void (*kbd_ledfunc)(unsigned int led); | 76 | extern void (*kbd_ledfunc)(unsigned int led); |
| 77 | 77 | ||
| 78 | extern void set_console(int nr); | 78 | extern int set_console(int nr); |
| 79 | extern void schedule_console_callback(void); | 79 | extern void schedule_console_callback(void); |
| 80 | 80 | ||
| 81 | static inline void set_leds(void) | 81 | static inline void set_leds(void) |