diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 22:44:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 22:44:25 +0200 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/watchdog/mpc8xxx_wdt.c | |
| parent | niu: Recognise original ethtool class code for AH/ESP flow hashing (diff) | |
| parent | caif: performance bugfix - allow radio stack to prioritize packets. (diff) | |
| download | linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.tar.xz linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/watchdog/mpc8xxx_wdt.c')
| -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; |