Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 1e3721a0eef7..3c4d29e59b2c 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -130,7 +130,9 @@ static irqreturn_t mpc52xx_uart_int(int irq, void *dev_id);
 
 #if defined(CONFIG_PPC_MERGE)
 static struct of_device_id mpc52xx_uart_of_match[] = {
-        { .type = "serial", .compatible = "mpc5200-psc-uart", },
+        { .type = "serial", .compatible = "fsl,mpc5200-psc-uart", },
+        { .type = "serial", .compatible = "mpc5200-psc-uart", }, /* lite5200 */
+        { .type = "serial", .compatible = "mpc5200-serial", }, /* efika */
         {},
 };
 #endif