diff options
Diffstat (limited to 'drivers/video/imx-ipu-v3/imx-ldb.c')
-rw-r--r-- | drivers/video/imx-ipu-v3/imx-ldb.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/video/imx-ipu-v3/imx-ldb.c b/drivers/video/imx-ipu-v3/imx-ldb.c index 4c934bc72e..3ed6d44f5b 100644 --- a/drivers/video/imx-ipu-v3/imx-ldb.c +++ b/drivers/video/imx-ipu-v3/imx-ldb.c @@ -19,8 +19,8 @@ #include <linux/clk.h> #include <linux/err.h> #include <linux/math64.h> -#include <mach/imx6-regs.h> -#include <mach/imx53-regs.h> +#include <mach/imx/imx6-regs.h> +#include <mach/imx/imx53-regs.h> #include "imx-ipu-v3.h" #include "ipuv3-plane.h" @@ -61,7 +61,7 @@ struct imx_ldb_data { }; struct imx_ldb { - struct device_d *dev; + struct device *dev; u32 bus_format; int mode_valid; struct imx_ldb_channel channel[2]; @@ -302,9 +302,9 @@ static int imx_ldb_ioctl(struct vpl *vpl, unsigned int port, return 0; } -static int imx_ldb_probe(struct device_d *dev) +static int imx_ldb_probe(struct device *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; struct device_node *child; struct imx_ldb *imx_ldb; int ret, i; @@ -403,8 +403,9 @@ static struct of_device_id imx_ldb_dt_ids[] = { { .compatible = "fsl,imx53-ldb", &imx_ldb_data_imx53}, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, imx_ldb_dt_ids); -static struct driver_d imx_ldb_driver = { +static struct driver imx_ldb_driver = { .probe = imx_ldb_probe, .of_compatible = imx_ldb_dt_ids, .name = "imx-ldb", |