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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
um
/
drivers
/
ssl.c
diff --git
a/arch/um/drivers/ssl.c
b/arch/um/drivers/ssl.c
index
a4d6415
..
ed9c590
100644
(file)
--- a/
arch/um/drivers/ssl.c
+++ b/
arch/um/drivers/ssl.c
@@
-3,7
+3,6
@@
* Licensed under the GPL
*/
* Licensed under the GPL
*/
-#include "linux/config.h"
#include "linux/fs.h"
#include "linux/tty.h"
#include "linux/tty_driver.h"
#include "linux/fs.h"
#include "linux/tty.h"
#include "linux/tty_driver.h"
@@
-23,7
+22,7
@@
#include "irq_user.h"
#include "mconsole_kern.h"
#include "irq_user.h"
#include "mconsole_kern.h"
-static int ssl_version = 1;
+static
const
int ssl_version = 1;
/* Referenced only by tty_driver below - presumably it's locked correctly
* by the tty driver.
/* Referenced only by tty_driver below - presumably it's locked correctly
* by the tty driver.
@@
-54,7
+53,6
@@
static int ssl_remove(int n);
static struct line_driver driver = {
.name = "UML serial line",
.device_name = "ttyS",
static struct line_driver driver = {
.name = "UML serial line",
.device_name = "ttyS",
- .devfs_name = "tts/",
.major = TTY_MAJOR,
.minor_start = 64,
.type = TTY_DRIVER_TYPE_SERIAL,
.major = TTY_MAJOR,
.minor_start = 64,
.type = TTY_DRIVER_TYPE_SERIAL,
@@
-124,7
+122,7
@@
void ssl_hangup(struct tty_struct *tty)
}
#endif
}
#endif
-static struct tty_operations ssl_ops = {
+static
const
struct tty_operations ssl_ops = {
.open = ssl_open,
.close = line_close,
.write = line_write,
.open = ssl_open,
.close = line_close,
.write = line_write,