diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 18:53:01 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 18:53:01 +0100 |
commit | 168268a225d24da3768a88c1029fb3014b0837ca (patch) | |
tree | afde019a1ac79366df0b96a2fcc8ba50bc5298fa /drivers/gpu/drm/exynos/exynos_drm_hdmi.h | |
parent | 04ee16bdf486061147c608410c2c9181352aaa3a (diff) | |
parent | 6f1989bc982bc176b0d63e028e9b7f23ae1b4583 (diff) |
Merge 'mmc/upstream' into late/mvebu2
These patches from the mmc tree were merged into v3.9 already
and the later mvebu patches depend on them.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_hdmi.h')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h index 784a7e9a766..d80516fc9ed 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h @@ -30,8 +30,8 @@ struct exynos_drm_hdmi_context { struct exynos_hdmi_ops { /* display */ bool (*is_connected)(void *ctx); - int (*get_edid)(void *ctx, struct drm_connector *connector, - u8 *edid, int len); + struct edid *(*get_edid)(void *ctx, + struct drm_connector *connector); int (*check_timing)(void *ctx, void *timing); int (*power_on)(void *ctx, int mode); |