tty: synclink_gt: Rename tty_driver_name
authorPeter Hurley <peter@hurleysoftware.com>
Sun, 8 Nov 2015 18:01:10 +0000 (13:01 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Dec 2015 03:59:48 +0000 (19:59 -0800)
Eliminate symbol name collision with new tty core function,
tty_driver_name().

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/synclink_gt.c

index 6fc39fbfc27556088e0aa1e6744996497bcb06ea..5505ea84217934fff36e56f720844ba72c175fdc 100644 (file)
@@ -89,7 +89,7 @@
  * module identification
  */
 static char *driver_name     = "SyncLink GT";
-static char *tty_driver_name = "synclink_gt";
+static char *slgt_driver_name = "synclink_gt";
 static char *tty_dev_prefix  = "ttySLG";
 MODULE_LICENSE("GPL");
 #define MGSL_MAGIC 0x5401
@@ -3799,7 +3799,7 @@ static int __init slgt_init(void)
 
        /* Initialize the tty_driver structure */
 
-       serial_driver->driver_name = tty_driver_name;
+       serial_driver->driver_name = slgt_driver_name;
        serial_driver->name = tty_dev_prefix;
        serial_driver->major = ttymajor;
        serial_driver->minor_start = 64;