From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 6 May 2008 14:41:44 +0000 (-0600)
Subject: POWERPC: mpc5200: Fix unterminated of_device_id table
X-Git-Tag: v2.6.25.3~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6981f54bdc1416f5172aa42db8cf8f83cc251c8a;p=karo-tx-linux.git

POWERPC: mpc5200: Fix unterminated of_device_id table

commit bc775eac63c16dbcfabc4c6e949c0228edf3e11f upstream

If CONFIG_PPC_MPC5121 is not set, then the of_device_id table for the
mpc5200 serial driver will not get terminated with a NULL entry.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index d93b3578c5e2..7a3625f52a03 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -1221,8 +1221,8 @@ static struct of_device_id mpc52xx_uart_of_match[] = {
 #endif
 #ifdef CONFIG_PPC_MPC512x
 	{ .compatible = "fsl,mpc5121-psc-uart", .data = &mpc512x_psc_ops, },
-	{},
 #endif
+	{},
 };
 
 static int __devinit