diff --git a/[refs] b/[refs] index e727da89ace5..ae7d6a801cba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c362cb597b5c30a32f4228136e0dfd9bf4c5d65b +refs/heads/master: 90fe6c608f8d46e5bb3f31c2d5e1c90475253f79 diff --git a/trunk/drivers/watchdog/of_xilinx_wdt.c b/trunk/drivers/watchdog/of_xilinx_wdt.c index 55d2f66dbeae..294fb4e00521 100644 --- a/trunk/drivers/watchdog/of_xilinx_wdt.c +++ b/trunk/drivers/watchdog/of_xilinx_wdt.c @@ -297,7 +297,7 @@ static int __devinit xwdt_probe(struct platform_device *pdev) no_timeout = 0; - pfreq = (u32 *)of_get_property(pdev->dev.of_node->parent, + pfreq = (u32 *)of_get_property(pdev->dev.of_node, "clock-frequency", NULL); if (pfreq == NULL) {