aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 13:34:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 13:34:41 -0700
commit0c3efe54d0165cecf0698b468e253577b555dde6 (patch)
treee004169ae37bc1b9fdc636146bd6967061f6f78a
parent132452ee2368cf775ccbef9746b51e3d2ba58b85 (diff)
parentd856b418464024dba4c7e901bab74dfb9a030d2e (diff)
downloadlinux-stericsson-0c3efe54d0165cecf0698b468e253577b555dde6.tar.gz
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
-rw-r--r--drivers/watchdog/mpc8xxx_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index 6709d723e017..528bceb220fd 100644
--- 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;