git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
um
/
drivers
/
stdio_console.c
diff --git
a/arch/um/drivers/stdio_console.c
b/arch/um/drivers/stdio_console.c
index
61db8b2
..
7a4897e
100644
(file)
--- a/
arch/um/drivers/stdio_console.c
+++ b/
arch/um/drivers/stdio_console.c
@@
-3,7
+3,6
@@
* Licensed under the GPL
*/
* Licensed under the GPL
*/
-#include "linux/config.h"
#include "linux/posix_types.h"
#include "linux/tty.h"
#include "linux/tty_flip.h"
#include "linux/posix_types.h"
#include "linux/tty.h"
#include "linux/tty_flip.h"
@@
-60,7
+59,6
@@
static int con_remove(int n);
static struct line_driver driver = {
.name = "UML console",
.device_name = "tty",
static struct line_driver driver = {
.name = "UML console",
.device_name = "tty",
- .devfs_name = "vc/",
.major = TTY_MAJOR,
.minor_start = 0,
.type = TTY_DRIVER_TYPE_CONSOLE,
.major = TTY_MAJOR,
.minor_start = 0,
.type = TTY_DRIVER_TYPE_CONSOLE,
@@
-109,9
+107,10
@@
static int con_open(struct tty_struct *tty, struct file *filp)
return line_open(vts, tty);
}
return line_open(vts, tty);
}
+/* Set in an initcall, checked in an exitcall */
static int con_init_done = 0;
static int con_init_done = 0;
-static struct tty_operations console_ops = {
+static
const
struct tty_operations console_ops = {
.open = con_open,
.close = line_close,
.write = line_write,
.open = con_open,
.close = line_close,
.write = line_write,