summaryrefslogtreecommitdiffstats
path: root/drivers/video/leo.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-05-31 06:14:26 +0200
committerPaul Mundt <lethal@linux-sh.org>2010-05-31 06:14:26 +0200
commitd5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch)
tree4facc6d96116b032a3c1cb2ced9b2a3008e9216e /drivers/video/leo.c
parentARM: mach-shmobile: SH7372 has 6 SCIFA and 1 SCIFB ports (diff)
parentLinux 2.6.35-rc1 (diff)
downloadlinux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.xz
linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/leo.c')
-rw-r--r--drivers/video/leo.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 1db55f128490..3d7895316eaf 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -663,8 +663,11 @@ static const struct of_device_id leo_match[] = {
MODULE_DEVICE_TABLE(of, leo_match);
static struct of_platform_driver leo_driver = {
- .name = "leo",
- .match_table = leo_match,
+ .driver = {
+ .name = "leo",
+ .owner = THIS_MODULE,
+ .of_match_table = leo_match,
+ },
.probe = leo_probe,
.remove = __devexit_p(leo_remove),
};