diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 16:34:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 16:34:41 -0400 |
| commit | 0c3efe54d0165cecf0698b468e253577b555dde6 (patch) | |
| tree | e004169ae37bc1b9fdc636146bd6967061f6f78a | |
| parent | 132452ee2368cf775ccbef9746b51e3d2ba58b85 (diff) | |
| parent | d856b418464024dba4c7e901bab74dfb9a030d2e (diff) | |
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.c | 2 |
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) | |||
| 195 | 195 | ||
| 196 | if (!ofdev->dev.of_match) | 196 | if (!ofdev->dev.of_match) |
| 197 | return -EINVAL; | 197 | return -EINVAL; |
| 198 | wdt_type = match->data; | 198 | wdt_type = ofdev->dev.of_match->data; |
| 199 | 199 | ||
| 200 | if (!freq || freq == -1) | 200 | if (!freq || freq == -1) |
| 201 | return -EINVAL; | 201 | return -EINVAL; |