diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
| commit | 08fa16b6b75005c120b59d00ae42a0b7cc68db45 (patch) | |
| tree | c5f22412467f72dd0c7291bbb958a9485e894f02 /drivers/video/leo.c | |
| parent | 1796b983cc4cbbed5e9e478b03591609a2c21987 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'drivers/video/leo.c')
| -rw-r--r-- | drivers/video/leo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/leo.c b/drivers/video/leo.c index 3d7895316eaf..9e8bf7d5e249 100644 --- a/drivers/video/leo.c +++ b/drivers/video/leo.c | |||
| @@ -550,7 +550,7 @@ static void leo_unmap_regs(struct of_device *op, struct fb_info *info, | |||
| 550 | static int __devinit leo_probe(struct of_device *op, | 550 | static int __devinit leo_probe(struct of_device *op, |
| 551 | const struct of_device_id *match) | 551 | const struct of_device_id *match) |
| 552 | { | 552 | { |
| 553 | struct device_node *dp = op->node; | 553 | struct device_node *dp = op->dev.of_node; |
| 554 | struct fb_info *info; | 554 | struct fb_info *info; |
| 555 | struct leo_par *par; | 555 | struct leo_par *par; |
| 556 | int linebytes, err; | 556 | int linebytes, err; |