From c7f02c4c79776c40c7c4306202bb16bca6491946 Mon Sep 17 00:00:00 2001
From: Russ Gorby <russ.gorby@intel.com>
Date: Mon, 7 Feb 2011 12:02:32 -0800
Subject: [PATCH] --- yaml --- r: 235528 b: refs/heads/master c:
 8115be01462f8af2dc22dd65dd28268bb9b8bff6 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/tty/serial/ifx6x60.c | 8 ++++----
 trunk/drivers/tty/serial/ifx6x60.h | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6190e887db5c..e6073592e4d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2aff8d90a073e5a07e1ff5a94779d6a21fb72dd2
+refs/heads/master: 8115be01462f8af2dc22dd65dd28268bb9b8bff6
diff --git a/trunk/drivers/tty/serial/ifx6x60.c b/trunk/drivers/tty/serial/ifx6x60.c
index 59e9cb87b7de..b68b96f53e6c 100644
--- a/trunk/drivers/tty/serial/ifx6x60.c
+++ b/trunk/drivers/tty/serial/ifx6x60.c
@@ -1333,9 +1333,9 @@ static const struct spi_device_id ifx_id_table[] = {
 MODULE_DEVICE_TABLE(spi, ifx_id_table);
 
 /* spi operations */
-static const struct spi_driver ifx_spi_driver_6160 = {
+static const struct spi_driver ifx_spi_driver = {
 	.driver = {
-		.name = "ifx6160",
+		.name = DRVNAME,
 		.bus = &spi_bus_type,
 		.pm = &ifx_spi_pm,
 		.owner = THIS_MODULE},
@@ -1357,7 +1357,7 @@ static void __exit ifx_spi_exit(void)
 {
 	/* unregister */
 	tty_unregister_driver(tty_drv);
-	spi_unregister_driver((void *)&ifx_spi_driver_6160);
+	spi_unregister_driver((void *)&ifx_spi_driver);
 }
 
 /**
@@ -1399,7 +1399,7 @@ static int __init ifx_spi_init(void)
 		return result;
 	}
 
-	result = spi_register_driver((void *)&ifx_spi_driver_6160);
+	result = spi_register_driver((void *)&ifx_spi_driver);
 	if (result) {
 		pr_err("%s: spi_register_driver failed(%d)",
 			DRVNAME, result);
diff --git a/trunk/drivers/tty/serial/ifx6x60.h b/trunk/drivers/tty/serial/ifx6x60.h
index 0ec39b58ccc4..e8464baf9e75 100644
--- a/trunk/drivers/tty/serial/ifx6x60.h
+++ b/trunk/drivers/tty/serial/ifx6x60.h
@@ -29,8 +29,6 @@
 #define DRVNAME				"ifx6x60"
 #define TTYNAME				"ttyIFX"
 
-/* #define IFX_THROTTLE_CODE */
-
 #define IFX_SPI_MAX_MINORS		1
 #define IFX_SPI_TRANSFER_SIZE		2048
 #define IFX_SPI_FIFO_SIZE		4096