diff options
Diffstat (limited to 'drivers/video/imx.c')
| -rw-r--r-- | drivers/video/imx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/imx.c b/drivers/video/imx.c index 612e06d45a..cb1c11b4cb 100644 --- a/drivers/video/imx.c +++ b/drivers/video/imx.c @@ -14,7 +14,7 @@ #include <common.h> #include <fb.h> #include <io.h> -#include <mach/imxfb.h> +#include <platform_data/imxfb.h> #include <driver.h> #include <malloc.h> #include <errno.h> @@ -150,7 +150,7 @@ struct imxfb_info { unused:30; struct fb_info info; - struct device_d *dev; + struct device *dev; void (*enable)(int enable); @@ -378,7 +378,7 @@ static struct fb_ops imxfb_ops = { .fb_activate_var = imxfb_activate_var, }; -static int imxfb_allocate_fbbuffer(const struct device_d *dev, +static int imxfb_allocate_fbbuffer(const struct device *dev, struct fb_info *info, void *forcefb) { size_t fbsize = info->xres * info->yres * (info->bits_per_pixel >> 3); @@ -401,7 +401,7 @@ static int imxfb_allocate_fbbuffer(const struct device_d *dev, * allocation as necessary, but in the absense of a better * function just use it. */ - info->screen_base = memalign(fbsize, SZ_4M); + info->screen_base = memalign(SZ_4M, fbsize); if (!info->screen_base) return -ENOMEM; memset(info->screen_base, 0, fbsize); @@ -525,7 +525,7 @@ static int imxfb_register_overlay(struct imxfb_info *fbi, void *fb) } #endif -static int imxfb_probe(struct device_d *dev) +static int imxfb_probe(struct device *dev) { struct resource *iores; struct imxfb_info *fbi; @@ -602,7 +602,7 @@ static int imxfb_probe(struct device_d *dev) return 0; } -static struct driver_d imxfb_driver = { +static struct driver imxfb_driver = { .name = "imxfb", .probe = imxfb_probe, }; |