diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-02 04:53:36 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-02 04:53:36 +0200 |
| commit | b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732 (patch) | |
| tree | 194e13dfa85d2d2af8bd125acd80a445ee0def62 /drivers/watchdog/riowd.c | |
| parent | ACPI / EC / PM: Fix names of functions that block/unblock EC transactions (diff) | |
| parent | ACPI: update feature-removal.txt to reflect deleted acpi=ht option (diff) | |
| download | linux-b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732.tar.xz linux-b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732.zip | |
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
Diffstat (limited to 'drivers/watchdog/riowd.c')
| -rw-r--r-- | drivers/watchdog/riowd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c index ea7f803f6248..5dceeddc8859 100644 --- a/drivers/watchdog/riowd.c +++ b/drivers/watchdog/riowd.c @@ -239,8 +239,11 @@ static const struct of_device_id riowd_match[] = { MODULE_DEVICE_TABLE(of, riowd_match); static struct of_platform_driver riowd_driver = { - .name = DRIVER_NAME, - .match_table = riowd_match, + .driver = { + .name = DRIVER_NAME, + .owner = THIS_MODULE, + .of_match_table = riowd_match, + }, .probe = riowd_probe, .remove = __devexit_p(riowd_remove), }; |