Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / drivers / gpu / drm / gma500 / cdv_device.c

diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index 23e14e93991f842820b98329bee03ef607b69365..162f686c532db9cfc8dd565b24b6af1d59fa33b6 100644 (file)
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c
@@ -641,6 +641,7 @@ const struct psb_ops cdv_chip_ops = {
 
        .crtc_helper = &cdv_intel_helper_funcs,
        .crtc_funcs = &cdv_intel_crtc_funcs,
+       .clock_funcs = &cdv_clock_funcs,
 
        .output_init = cdv_output_init,
        .hotplug = cdv_hotplug_event,
@@ -655,4 +656,6 @@ const struct psb_ops cdv_chip_ops = {
        .restore_regs = cdv_restore_display_registers,
        .power_down = cdv_power_down,
        .power_up = cdv_power_up,
+       .update_wm = cdv_update_wm,
+       .disable_sr = cdv_disable_sr,
 };