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

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: mpc8xxx_wdt: fix build
This commit is contained in:
Linus Torvalds 2011-04-07 13:34:41 -07:00
commit 0c3efe54d0

View File

@ -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;