Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into...

[karo-tx-linux.git] / drivers / gpu / drm / armada / armada_output.h

diff --git a/drivers/gpu/drm/armada/armada_output.h b/drivers/gpu/drm/armada/armada_output.h
index d3a6ce79d0945ae1085e62d3fbcaca6590b04879..f448785753e8d0a9029051ed01676b521e6e6ef2 100644 (file)
--- a/drivers/gpu/drm/armada/armada_output.h
+++ b/drivers/gpu/drm/armada/armada_output.h
@@ -9,7 +9,7 @@
 #define ARMADA_CONNETOR_H
 
 #define encoder_helper_funcs(encoder) \
-       ((struct drm_encoder_helper_funcs *)encoder->helper_private)
+       ((const struct drm_encoder_helper_funcs *)encoder->helper_private)
 
 struct armada_output_type {
        int connector_type;