diff options
Diffstat (limited to 'drivers/video/ffb.c')
-rw-r--r-- | drivers/video/ffb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index a42fabab69df..95c0227f47fc 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c | |||
@@ -896,7 +896,7 @@ static void ffb_init_fix(struct fb_info *info) | |||
896 | static int __devinit ffb_probe(struct of_device *op, | 896 | static int __devinit ffb_probe(struct of_device *op, |
897 | const struct of_device_id *match) | 897 | const struct of_device_id *match) |
898 | { | 898 | { |
899 | struct device_node *dp = op->node; | 899 | struct device_node *dp = op->dev.of_node; |
900 | struct ffb_fbc __iomem *fbc; | 900 | struct ffb_fbc __iomem *fbc; |
901 | struct ffb_dac __iomem *dac; | 901 | struct ffb_dac __iomem *dac; |
902 | struct fb_info *info; | 902 | struct fb_info *info; |
@@ -1053,8 +1053,11 @@ static const struct of_device_id ffb_match[] = { | |||
1053 | MODULE_DEVICE_TABLE(of, ffb_match); | 1053 | MODULE_DEVICE_TABLE(of, ffb_match); |
1054 | 1054 | ||
1055 | static struct of_platform_driver ffb_driver = { | 1055 | static struct of_platform_driver ffb_driver = { |
1056 | .name = "ffb", | 1056 | .driver = { |
1057 | .match_table = ffb_match, | 1057 | .name = "ffb", |
1058 | .owner = THIS_MODULE, | ||
1059 | .of_match_table = ffb_match, | ||
1060 | }, | ||
1058 | .probe = ffb_probe, | 1061 | .probe = ffb_probe, |
1059 | .remove = __devexit_p(ffb_remove), | 1062 | .remove = __devexit_p(ffb_remove), |
1060 | }; | 1063 | }; |