commit 0c3efe54d0165cecf0698b468e253577b555dde6
author Linus Torvalds <torvalds@linux-foundation.org> Thu Apr 07 13:34:41 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Apr 07 13:34:41 2011 -0700
tree e004169ae37bc1b9fdc636146bd6967061f6f78a
parent 132452ee2368cf775ccbef9746b51e3d2ba58b85
parent d856b418464024dba4c7e901bab74dfb9a030d2e

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

drivers/watchdog/mpc8xxx_wdt.c

diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index 6709d72..528bceb 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -195,7 +195,7 @@
 
 	if (!ofdev->dev.of_match)
 		return -EINVAL;
-	wdt_type = match->data;
+	wdt_type = ofdev->dev.of_match->data;
 
 	if (!freq || freq == -1)
 		return -EINVAL;