diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 00:15:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 15:25:09 -0400 |
commit | 264f48646e6829b4d00a0e058452578318e6fb15 (patch) | |
tree | a5a21554e26ae59e7b3a5af3e8c76e7daa8af9f3 | |
parent | 5e483075a1f9862a65af648d1d939499969c7b5d (diff) |
[PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed
Also fixes all drivers that set this field.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | arch/um/drivers/line.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/ssl.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/stdio_console.c | 1 | ||||
-rw-r--r-- | arch/um/include/line.h | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index ee1fe6a24905..5ca57ca33713 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c | |||
@@ -654,7 +654,6 @@ struct tty_driver *line_register_devfs(struct lines *set, | |||
654 | 654 | ||
655 | driver->driver_name = line_driver->name; | 655 | driver->driver_name = line_driver->name; |
656 | driver->name = line_driver->device_name; | 656 | driver->name = line_driver->device_name; |
657 | driver->devfs_name = line_driver->devfs_name; | ||
658 | driver->major = line_driver->major; | 657 | driver->major = line_driver->major; |
659 | driver->minor_start = line_driver->minor_start; | 658 | driver->minor_start = line_driver->minor_start; |
660 | driver->type = line_driver->type; | 659 | driver->type = line_driver->type; |
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index a4d6415bc8c4..6dafd6fbfdae 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c | |||
@@ -54,7 +54,6 @@ static int ssl_remove(int n); | |||
54 | static struct line_driver driver = { | 54 | static struct line_driver driver = { |
55 | .name = "UML serial line", | 55 | .name = "UML serial line", |
56 | .device_name = "ttyS", | 56 | .device_name = "ttyS", |
57 | .devfs_name = "tts/", | ||
58 | .major = TTY_MAJOR, | 57 | .major = TTY_MAJOR, |
59 | .minor_start = 64, | 58 | .minor_start = 64, |
60 | .type = TTY_DRIVER_TYPE_SERIAL, | 59 | .type = TTY_DRIVER_TYPE_SERIAL, |
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c index 61db8b2fc83f..856f568c2687 100644 --- a/arch/um/drivers/stdio_console.c +++ b/arch/um/drivers/stdio_console.c | |||
@@ -60,7 +60,6 @@ static int con_remove(int n); | |||
60 | static struct line_driver driver = { | 60 | static struct line_driver driver = { |
61 | .name = "UML console", | 61 | .name = "UML console", |
62 | .device_name = "tty", | 62 | .device_name = "tty", |
63 | .devfs_name = "vc/", | ||
64 | .major = TTY_MAJOR, | 63 | .major = TTY_MAJOR, |
65 | .minor_start = 0, | 64 | .minor_start = 0, |
66 | .type = TTY_DRIVER_TYPE_CONSOLE, | 65 | .type = TTY_DRIVER_TYPE_CONSOLE, |
diff --git a/arch/um/include/line.h b/arch/um/include/line.h index 6ac0f8252e21..27bf2f6fbc05 100644 --- a/arch/um/include/line.h +++ b/arch/um/include/line.h | |||
@@ -17,7 +17,6 @@ | |||
17 | struct line_driver { | 17 | struct line_driver { |
18 | char *name; | 18 | char *name; |
19 | char *device_name; | 19 | char *device_name; |
20 | char *devfs_name; | ||
21 | short major; | 20 | short major; |
22 | short minor_start; | 21 | short minor_start; |
23 | short type; | 22 | short type; |