aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2008-05-06 08:41:44 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-09 21:40:47 -0700
commit6981f54bdc1416f5172aa42db8cf8f83cc251c8a (patch)
tree0a51d4e7a8490af468d640347dc863f1b05676c2
parentd5d70ec0dca55f84071354c10fbb1162023fab0a (diff)
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>
-rw-r--r--drivers/serial/mpc52xx_uart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index d93b3578c5e..7a3625f52a0 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