projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[powerpc.git]
/
drivers
/
isdn
/
gigaset
/
interface.c
diff --git
a/drivers/isdn/gigaset/interface.c
b/drivers/isdn/gigaset/interface.c
index
74fd234
..
bd2e426
100644
(file)
--- a/
drivers/isdn/gigaset/interface.c
+++ b/
drivers/isdn/gigaset/interface.c
@@
-673,10
+673,9
@@
EXPORT_SYMBOL_GPL(gigaset_if_receive);
* drv Driver
* procname Name of the driver (e.g. for /proc/tty/drivers)
* devname Name of the device files (prefix without minor number)
* drv Driver
* procname Name of the driver (e.g. for /proc/tty/drivers)
* devname Name of the device files (prefix without minor number)
- * devfsname Devfs name of the device files without %d
*/
void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
*/
void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
- const char *devname
, const char *devfsname
)
+ const char *devname)
{
unsigned minors = drv->minors;
int ret;
{
unsigned minors = drv->minors;
int ret;
@@
-692,7
+691,7
@@
void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
tty->major = GIG_MAJOR,
tty->type = TTY_DRIVER_TYPE_SERIAL,
tty->subtype = SERIAL_TYPE_NORMAL,
tty->major = GIG_MAJOR,
tty->type = TTY_DRIVER_TYPE_SERIAL,
tty->subtype = SERIAL_TYPE_NORMAL,
- tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_
NO_DEVFS,
+ tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_
DYNAMIC_DEV;
tty->driver_name = procname;
tty->name = devname;
tty->driver_name = procname;
tty->name = devname;
@@
-700,7
+699,6
@@
void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
tty->num = drv->minors;
tty->owner = THIS_MODULE;
tty->num = drv->minors;
tty->owner = THIS_MODULE;
- tty->devfs_name = devfsname;
tty->init_termios = tty_std_termios; //FIXME
tty->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; //FIXME
tty->init_termios = tty_std_termios; //FIXME
tty->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; //FIXME