From 88528fb2ab577a6f4b693fa745326e97cd537e43 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 20 Jun 2005 21:15:16 -0700
Subject: [PATCH] --- yaml --- r: 31286 b: refs/heads/master c:
 264f48646e6829b4d00a0e058452578318e6fb15 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/um/drivers/line.c          | 1 -
 trunk/arch/um/drivers/ssl.c           | 1 -
 trunk/arch/um/drivers/stdio_console.c | 1 -
 trunk/arch/um/include/line.h          | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 32a33b988e9e..4cb108ea4e3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e483075a1f9862a65af648d1d939499969c7b5d
+refs/heads/master: 264f48646e6829b4d00a0e058452578318e6fb15
diff --git a/trunk/arch/um/drivers/line.c b/trunk/arch/um/drivers/line.c
index ee1fe6a24905..5ca57ca33713 100644
--- a/trunk/arch/um/drivers/line.c
+++ b/trunk/arch/um/drivers/line.c
@@ -654,7 +654,6 @@ struct tty_driver *line_register_devfs(struct lines *set,
 
 	driver->driver_name = line_driver->name;
 	driver->name = line_driver->device_name;
-	driver->devfs_name = line_driver->devfs_name;
 	driver->major = line_driver->major;
 	driver->minor_start = line_driver->minor_start;
 	driver->type = line_driver->type;
diff --git a/trunk/arch/um/drivers/ssl.c b/trunk/arch/um/drivers/ssl.c
index a4d6415bc8c4..6dafd6fbfdae 100644
--- a/trunk/arch/um/drivers/ssl.c
+++ b/trunk/arch/um/drivers/ssl.c
@@ -54,7 +54,6 @@ static int ssl_remove(int n);
 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,
diff --git a/trunk/arch/um/drivers/stdio_console.c b/trunk/arch/um/drivers/stdio_console.c
index 61db8b2fc83f..856f568c2687 100644
--- a/trunk/arch/um/drivers/stdio_console.c
+++ b/trunk/arch/um/drivers/stdio_console.c
@@ -60,7 +60,6 @@ static int con_remove(int n);
 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,
diff --git a/trunk/arch/um/include/line.h b/trunk/arch/um/include/line.h
index 6ac0f8252e21..27bf2f6fbc05 100644
--- a/trunk/arch/um/include/line.h
+++ b/trunk/arch/um/include/line.h
@@ -17,7 +17,6 @@
 struct line_driver {
 	char *name;
 	char *device_name;
-	char *devfs_name;
 	short major;
 	short minor_start;
 	short type;