From 4fd918001c7be9e33887c45bf51b63926467567f Mon Sep 17 00:00:00 2001
From: Josh Cartwright <josh.cartwright@ni.com>
Date: Mon, 5 Nov 2012 15:24:26 -0600
Subject: [PATCH] --- yaml --- r: 338409 b: refs/heads/master c:
 4bb535d2b6fe1466d89037c95945cc7bf5ba2377 h: refs/heads/master i:   338407:
 7fcf335e588d82f8e44cb8b94d7d20f16e2c8e2c v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/tty/serial/Kconfig         | 1 +
 trunk/drivers/tty/serial/xilinx_uartps.c | 9 ---------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 23691da1ae78..b7d759d3c9b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1519e23c2b3a518fb41daf3eceae43382433ceb
+refs/heads/master: 4bb535d2b6fe1466d89037c95945cc7bf5ba2377
diff --git a/trunk/drivers/tty/serial/Kconfig b/trunk/drivers/tty/serial/Kconfig
index b1768012ed21..6a69c88c5020 100644
--- a/trunk/drivers/tty/serial/Kconfig
+++ b/trunk/drivers/tty/serial/Kconfig
@@ -1376,6 +1376,7 @@ config SERIAL_MXS_AUART_CONSOLE
 
 config SERIAL_XILINX_PS_UART
 	tristate "Xilinx PS UART support"
+	depends on OF
 	select SERIAL_CORE
 	help
 	  This driver supports the Xilinx PS UART port.
diff --git a/trunk/drivers/tty/serial/xilinx_uartps.c b/trunk/drivers/tty/serial/xilinx_uartps.c
index b627363352e5..23efe17be44b 100644
--- a/trunk/drivers/tty/serial/xilinx_uartps.c
+++ b/trunk/drivers/tty/serial/xilinx_uartps.c
@@ -946,15 +946,11 @@ static int __devinit xuartps_probe(struct platform_device *pdev)
 	struct resource *res, *res2;
 	int clk = 0;
 
-#ifdef CONFIG_OF
 	const unsigned int *prop;
 
 	prop = of_get_property(pdev->dev.of_node, "clock", NULL);
 	if (prop)
 		clk = be32_to_cpup(prop);
-#else
-	clk = *((unsigned int *)(pdev->dev.platform_data));
-#endif
 	if (!clk) {
 		dev_err(&pdev->dev, "no clock specified\n");
 		return -ENODEV;
@@ -1044,16 +1040,11 @@ static int xuartps_resume(struct platform_device *pdev)
 }
 
 /* Match table for of_platform binding */
-
-#ifdef CONFIG_OF
 static struct of_device_id xuartps_of_match[] __devinitdata = {
 	{ .compatible = "xlnx,xuartps", },
 	{}
 };
 MODULE_DEVICE_TABLE(of, xuartps_of_match);
-#else
-#define xuartps_of_match NULL
-#endif
 
 static struct platform_driver xuartps_platform_driver = {
 	.probe   = xuartps_probe,		/* Probe method */