Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

…chdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: mpc8xxx_wdt: fix build
redpig · Apr 7, 2011 · 0c3efe5 · 0c3efe5
2 parents 132452e + d856b41
commit 0c3efe5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
@@ -195,7 +195,7 @@ static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev)
 
 	if (!ofdev->dev.of_match)
 		return -EINVAL;
-	wdt_type = match->data;
+	wdt_type = ofdev->dev.of_match->data;
 
 	if (!freq || freq == -1)
 		return -EINVAL;