git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation
[safe/jmp/linux-2.6]
/
drivers
/
char
/
rocket.c
diff --git
a/drivers/char/rocket.c
b/drivers/char/rocket.c
index
0708c51
..
bac8005
100644
(file)
--- a/
drivers/char/rocket.c
+++ b/
drivers/char/rocket.c
@@
-2334,7
+2334,7
@@
static int __init init_ISA(int i)
return (1);
}
return (1);
}
-static struct tty_operations rocket_ops = {
+static
const
struct tty_operations rocket_ops = {
.open = rp_open,
.close = rp_close,
.write = rp_write,
.open = rp_open,
.close = rp_close,
.write = rp_write,
@@
-2426,8
+2426,7
@@
static int __init rp_init(void)
*/
rocket_driver->owner = THIS_MODULE;
*/
rocket_driver->owner = THIS_MODULE;
- rocket_driver->flags = TTY_DRIVER_NO_DEVFS;
- rocket_driver->devfs_name = "tts/R";
+ rocket_driver->flags = TTY_DRIVER_DYNAMIC_DEV;
rocket_driver->name = "ttyR";
rocket_driver->driver_name = "Comtrol RocketPort";
rocket_driver->major = TTY_ROCKET_MAJOR;
rocket_driver->name = "ttyR";
rocket_driver->driver_name = "Comtrol RocketPort";
rocket_driver->major = TTY_ROCKET_MAJOR;
@@
-2438,7
+2437,7
@@
static int __init rp_init(void)
rocket_driver->init_termios.c_cflag =
B9600 | CS8 | CREAD | HUPCL | CLOCAL;
#ifdef ROCKET_SOFT_FLOW
rocket_driver->init_termios.c_cflag =
B9600 | CS8 | CREAD | HUPCL | CLOCAL;
#ifdef ROCKET_SOFT_FLOW
- rocket_driver->flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_
NO_DEVFS
;
+ rocket_driver->flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_
DYNAMIC_DEV
;
#endif
tty_set_operations(rocket_driver, &rocket_ops);
#endif
tty_set_operations(rocket_driver, &rocket_ops);