git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
drivers
/
watchdog
/
riowd.c
diff --git
a/drivers/watchdog/riowd.c
b/drivers/watchdog/riowd.c
index
ea7f803
..
5dceedd
100644
(file)
--- 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 = {
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),
};
.probe = riowd_probe,
.remove = __devexit_p(riowd_remove),
};