diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-01 22:53:36 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-01 22:53:36 -0400 |
| commit | b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732 (patch) | |
| tree | 194e13dfa85d2d2af8bd125acd80a445ee0def62 /drivers/video/mb862xx | |
| parent | fe955682d2153b35dffcf1673dff0491096a3f0a (diff) | |
| parent | 0a76a34ff0804f1f413807b2e2d12117c2b602ca (diff) | |
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
Diffstat (limited to 'drivers/video/mb862xx')
| -rw-r--r-- | drivers/video/mb862xx/mb862xxfb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c index 8280a58a0e5..0540de4f5cb 100644 --- a/drivers/video/mb862xx/mb862xxfb.c +++ b/drivers/video/mb862xx/mb862xxfb.c @@ -718,9 +718,11 @@ static struct of_device_id __devinitdata of_platform_mb862xx_tbl[] = { }; static struct of_platform_driver of_platform_mb862xxfb_driver = { - .owner = THIS_MODULE, - .name = DRV_NAME, - .match_table = of_platform_mb862xx_tbl, + .driver = { + .name = DRV_NAME, + .owner = THIS_MODULE, + .of_match_table = of_platform_mb862xx_tbl, + }, .probe = of_platform_mb862xx_probe, .remove = __devexit_p(of_platform_mb862xx_remove), }; |