diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 13:34:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 13:34:41 -0700 |
| commit | 0c3efe54d0165cecf0698b468e253577b555dde6 (patch) | |
| tree | e004169ae37bc1b9fdc636146bd6967061f6f78a /drivers | |
| parent | Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 (diff) | |
| parent | watchdog: mpc8xxx_wdt: fix build (diff) | |
| download | linux-dev-0c3efe54d0165cecf0698b468e253577b555dde6.tar.xz linux-dev-0c3efe54d0165cecf0698b468e253577b555dde6.zip | |
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
Diffstat (limited to 'drivers')
| -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) if (!ofdev->dev.of_match) return -EINVAL; - wdt_type = match->data; + wdt_type = ofdev->dev.of_match->data; if (!freq || freq == -1) return -EINVAL; |