diff --git a/[refs] b/[refs] index 8e6a46b7a6c6..ef56723ca7b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e9cc6a13ac0c6a5a1fef5ca2bda0925832516f3 +refs/heads/master: 41c243464f2420744f1c14da77e230440c1c31b4 diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_core.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_core.c index edb0ee13cffc..661a03571d0c 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_core.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_core.c @@ -55,7 +55,7 @@ static int exynos_drm_subdrv_probe(struct drm_device *dev, * * P.S. note that this driver is considered for modularization. */ - ret = subdrv->probe(dev); + ret = subdrv->probe(dev, subdrv->manager.dev); if (ret) return ret; } diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_drv.h b/trunk/drivers/gpu/drm/exynos/exynos_drm_drv.h index 4ea137158de3..002f2925106a 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -219,7 +219,7 @@ struct exynos_drm_subdrv { struct list_head list; struct drm_device *drm_dev; - int (*probe)(struct drm_device *dev); + int (*probe)(struct drm_device *drm_dev, struct device *dev); void (*remove)(struct drm_device *dev); struct exynos_drm_manager manager; diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 9d1138e4fb4e..b0afa8493230 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -538,7 +538,7 @@ static irqreturn_t fimd_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } -static int fimd_subdrv_probe(struct drm_device *drm_dev) +static int fimd_subdrv_probe(struct drm_device *drm_dev, struct device *dev) { struct drm_driver *drm_driver = drm_dev->driver;