diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-23 08:45:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-23 08:45:23 +1000 |
| commit | 3cfa8f6c542467bd046aedb9d2e394b3d0e8467f (patch) | |
| tree | fe8e6c5e4ad1bfb51bc1896b6dd8f616f266eb76 /drivers | |
| parent | 55b70a0300b873c0ec7ea6e33752af56f41250ce (diff) | |
| parent | 9dda78b711ca4d507251a7e896b2f41ec019fc58 (diff) | |
| download | linux-3.10-3cfa8f6c542467bd046aedb9d2e394b3d0e8467f.tar.gz linux-3.10-3cfa8f6c542467bd046aedb9d2e394b3d0e8467f.tar.bz2 linux-3.10-3cfa8f6c542467bd046aedb9d2e394b3d0e8467f.zip | |
Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/mpc5200_wdt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c index 9cfb9757662..11f6a111e75 100644 --- a/drivers/watchdog/mpc5200_wdt.c +++ b/drivers/watchdog/mpc5200_wdt.c @@ -176,6 +176,8 @@ static int mpc5200_wdt_probe(struct of_device *op, const struct of_device_id *ma has_wdt = of_get_property(op->node, "has-wdt", NULL); if (!has_wdt) + has_wdt = of_get_property(op->node, "fsl,has-wdt", NULL); + if (!has_wdt) return -ENODEV; wdt = kzalloc(sizeof(*wdt), GFP_KERNEL); @@ -254,6 +256,7 @@ static int mpc5200_wdt_shutdown(struct of_device *op) static struct of_device_id mpc5200_wdt_match[] = { { .compatible = "mpc5200-gpt", }, + { .compatible = "fsl,mpc5200-gpt", }, {}, }; static struct of_platform_driver mpc5200_wdt_driver = { |