From 4b07e2257d3ecc4c6c0699faaa4a2a8a62c6f942 Mon Sep 17 00:00:00 2001
From: John Rigby <jrigby@freescale.com>
Date: Wed, 23 May 2007 11:30:55 -0600
Subject: [PATCH] --- yaml --- r: 67327 b: refs/heads/master c:
 af6a9aabc106b70ab03d6665c713bca3dd3cb195 h: refs/heads/master i:   67325:
 d87b0c2efc0224ebbdf9bdb3da698a90f42eddc4   67323:
 7fe40ad291329237bd782b4fae51053e926c1d79   67319:
 c3754085b42231d825525b2bf4165f1617e52b37   67311:
 88c3dd9762ceab9edaa94c44dc79d06a4cae3b64   67295:
 4267760480a85a9e5468e08bd674aa5cafada2ea   67263:
 3fd887b869f5ca74cbd024f7ed6822cc0a01f4c2   67199:
 3577b2fb41cbc084e924199ec5fce5a0d5f1504f   67071:
 b1e4fa7a52ca17fd29b2f01631c0da1c03f0e270 v: v3

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

diff --git a/[refs] b/[refs]
index d6a32827cdef..9e6871eff2f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82925e76db19112cad62066828c1db0bbb3f77e3
+refs/heads/master: af6a9aabc106b70ab03d6665c713bca3dd3cb195
diff --git a/trunk/drivers/serial/mpc52xx_uart.c b/trunk/drivers/serial/mpc52xx_uart.c
index 35f8b86cc78f..035cca028199 100644
--- a/trunk/drivers/serial/mpc52xx_uart.c
+++ b/trunk/drivers/serial/mpc52xx_uart.c
@@ -1051,7 +1051,7 @@ mpc52xx_uart_of_assign(struct device_node *np, int idx)
 	/* If the slot is already occupied, then swap slots */
 	if (mpc52xx_uart_nodes[idx] && (free_idx != -1))
 		mpc52xx_uart_nodes[free_idx] = mpc52xx_uart_nodes[idx];
-	mpc52xx_uart_nodes[i] = np;
+	mpc52xx_uart_nodes[idx] = np;
 }
 
 static void