diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-18 15:28:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-18 15:28:20 +1000 |
| commit | 0e607679f0fc47e08cb073f7a538be4ffaa62515 (patch) | |
| tree | bf762595136f3ecf58917a47b0e3cfcfcc185bb4 /drivers/video/cg6.c | |
| parent | 0ba24dccc58a5b514f0436a0933d3f7fed9eb6c5 (diff) | |
| parent | b08369db1245efba77a528301f1b517ce68bf3e2 (diff) | |
Merge remote branch 'devicetree/next-devicetree'
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/serial/mpc52xx_uart.c
Diffstat (limited to 'drivers/video/cg6.c')
| -rw-r--r-- | drivers/video/cg6.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 6d0fcb43696e..480d761a27a8 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c @@ -740,7 +740,7 @@ static void cg6_unmap_regs(struct of_device *op, struct fb_info *info, static int __devinit cg6_probe(struct of_device *op, const struct of_device_id *match) { - struct device_node *dp = op->node; + struct device_node *dp = op->dev.of_node; struct fb_info *info; struct cg6_par *par; int linebytes, err; @@ -856,8 +856,11 @@ static const struct of_device_id cg6_match[] = { MODULE_DEVICE_TABLE(of, cg6_match); static struct of_platform_driver cg6_driver = { - .name = "cg6", - .match_table = cg6_match, + .driver = { + .name = "cg6", + .owner = THIS_MODULE, + .of_match_table = cg6_match, + }, .probe = cg6_probe, .remove = __devexit_p(cg6_remove), }; |