From ee543894a3b9ae20355cc162b711f405414f0e1c Mon Sep 17 00:00:00 2001
From: Wolfgang Grandegger <wg@denx.de>
Date: Thu, 14 Jan 2010 01:05:48 +0000
Subject: [PATCH] --- yaml --- r: 183519 b: refs/heads/master c:
 c5bab5e94d148aee2c852450374143c89aa56511 h: refs/heads/master i:   183517:
 9531275a63ca45ffcedb0bb7da7d99ac56ed218c   183515:
 9a311a4b8de507c0c3f7a0d098d2b9408fc1c93b   183511:
 3bb3e069406b001b28850b0a4d3943ee43a4bd54   183503:
 489f9646878031c60335f7874dc8a698082130dc   183487:
 dc96e8070f124808d7eaf2d639c3d8e37c949d8b v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/can/mscan/mpc5xxx_can.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 37cb6a492cce..6a36d32757ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a4d5c94e959359ece6d6b55045c3f046677f55c
+refs/heads/master: c5bab5e94d148aee2c852450374143c89aa56511
diff --git a/trunk/drivers/net/can/mscan/mpc5xxx_can.c b/trunk/drivers/net/can/mscan/mpc5xxx_can.c
index f73487f723b8..03e7c48465a2 100644
--- a/trunk/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/trunk/drivers/net/can/mscan/mpc5xxx_can.c
@@ -43,7 +43,7 @@ struct mpc5xxx_can_data {
 			 int *mscan_clksrc);
 };
 
-#ifdef CONFIG_PPC_MPC5200
+#ifdef CONFIG_PPC_MPC52xx
 static struct of_device_id __devinitdata mpc52xx_cdm_ids[] = {
 	{ .compatible = "fsl,mpc5200-cdm", },
 	{}
@@ -84,7 +84,7 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
 	/* Determine SYS_XTAL_IN frequency from the clock domain settings */
 	np_cdm = of_find_matching_node(NULL, mpc52xx_cdm_ids);
 	if (!np_cdm) {
-		dev_err(&of->dev, "can't get clock node!\n");
+		dev_err(&ofdev->dev, "can't get clock node!\n");
 		return 0;
 	}
 	cdm = of_iomap(np_cdm, 0);
@@ -101,14 +101,14 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
 
 	return freq;
 }
-#else /* !CONFIG_PPC_MPC5200 */
+#else /* !CONFIG_PPC_MPC52xx */
 static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
 					   const char *clock_name,
 					   int *mscan_clksrc)
 {
 	return 0;
 }
-#endif /* CONFIG_PPC_MPC5200 */
+#endif /* CONFIG_PPC_MPC52xx */
 
 #ifdef CONFIG_PPC_MPC512x
 struct mpc512x_clockctl {