From 096a58c6e350b612566fb1365548df0f13cfe7d5 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Wed, 6 Feb 2008 22:29:25 -0700
Subject: [PATCH] --- yaml --- r: 83977 b: refs/heads/master c:
 52b804829ca4cf3d1d9849232dadf67269cd89f4 h: refs/heads/master i:   83975:
 abe82484440035cfe5a7524d30eef60840aaafc4 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/serial/mpc52xx_uart.c | 39 +++++++++++------------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index c16b94f02009..341225bc0efe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de0723dcca6e593a12a259798a54eb0e82628fb8
+refs/heads/master: 52b804829ca4cf3d1d9849232dadf67269cd89f4
diff --git a/trunk/drivers/serial/mpc52xx_uart.c b/trunk/drivers/serial/mpc52xx_uart.c
index 821facd10bbc..a638f23c6c61 100644
--- a/trunk/drivers/serial/mpc52xx_uart.c
+++ b/trunk/drivers/serial/mpc52xx_uart.c
@@ -131,31 +131,6 @@ static irqreturn_t mpc52xx_uart_int(int irq, void *dev_id);
 #define uart_console(port)	(0)
 #endif
 
-#if defined(CONFIG_PPC_MERGE)
-static struct of_device_id mpc52xx_uart_of_match[] = {
-#ifdef CONFIG_PPC_MPC52xx
-	{ .compatible = "fsl,mpc5200-psc-uart", .data = &mpc52xx_psc_ops, },
-	/* binding used by old lite5200 device trees: */
-	{ .compatible = "mpc5200-psc-uart", .data = &mpc52xx_psc_ops, },
-	/* binding used by efika: */
-	{ .compatible = "mpc5200-serial", .data = &mpc52xx_psc_ops, },
-#endif
-#ifdef CONFIG_PPC_MPC512x
-	{ .compatible = "fsl,mpc5121-psc-uart", .data = &mpc512x_psc_ops, },
-	{},
-#endif
-};
-#if defined(CONFIG_PPC_MERGE)
-static const struct of_device_id mpc52xx_uart_of_match[] = {
-	{.type = "serial",
-	 .compatible = "mpc5200-psc-uart",
-#endif
-	{},
-};
-#endif
-
-#endif
-
 /* ======================================================================== */
 /* PSC fifo operations for isolating differences between 52xx and 512x      */
 /* ======================================================================== */
@@ -1234,6 +1209,20 @@ static struct platform_driver mpc52xx_uart_platform_driver = {
 /* OF Platform Driver                                                       */
 /* ======================================================================== */
 
+static struct of_device_id mpc52xx_uart_of_match[] = {
+#ifdef CONFIG_PPC_MPC52xx
+	{ .compatible = "fsl,mpc5200-psc-uart", .data = &mpc52xx_psc_ops, },
+	/* binding used by old lite5200 device trees: */
+	{ .compatible = "mpc5200-psc-uart", .data = &mpc52xx_psc_ops, },
+	/* binding used by efika: */
+	{ .compatible = "mpc5200-serial", .data = &mpc52xx_psc_ops, },
+#endif
+#ifdef CONFIG_PPC_MPC512x
+	{ .compatible = "fsl,mpc5121-psc-uart", .data = &mpc512x_psc_ops, },
+	{},
+#endif
+};
+
 static int __devinit
 mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
 {