git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
include
/
linux
/
vt_kern.h
diff --git
a/include/linux/vt_kern.h
b/include/linux/vt_kern.h
index
fab5aed
..
918a297
100644
(file)
--- a/
include/linux/vt_kern.h
+++ b/
include/linux/vt_kern.h
@@
-6,7
+6,6
@@
* with information needed by the vt package
*/
* with information needed by the vt package
*/
-#include <linux/config.h>
#include <linux/vt.h>
#include <linux/kd.h>
#include <linux/tty.h>
#include <linux/vt.h>
#include <linux/kd.h>
#include <linux/tty.h>
@@
-27,6
+26,7
@@
extern void kd_mksound(unsigned int hz, unsigned int ticks);
extern int kbd_rate(struct kbd_repeat *rep);
extern void kd_mksound(unsigned int hz, unsigned int ticks);
extern int kbd_rate(struct kbd_repeat *rep);
+extern int fg_console, last_console, want_console;
/* console.c */
/* console.c */