Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / drivers / gpu / drm / gma500 / mdfld_dsi_output.h

diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.h b/drivers/gpu/drm/gma500/mdfld_dsi_output.h
index 36eb0744841c7c2f4071da62b11ba45006d7b466..45d5af0546bf374c11ba4bc737c74a5f13cc8e39 100644 (file)
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.h
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.h
@@ -227,7 +227,7 @@ enum {
 #define DSI_DPI_DISABLE_BTA                                    BIT(3)
 
 struct mdfld_dsi_connector {
-       struct psb_intel_connector base;
+       struct gma_connector base;
 
        int pipe;
        void *private;
@@ -238,7 +238,7 @@ struct mdfld_dsi_connector {
 };
 
 struct mdfld_dsi_encoder {
-       struct psb_intel_encoder base;
+       struct gma_encoder base;
        void *private;
 };
 
@@ -269,21 +269,21 @@ struct mdfld_dsi_config {
 static inline struct mdfld_dsi_connector *mdfld_dsi_connector(
                struct drm_connector *connector)
 {
-       struct psb_intel_connector *psb_connector;
+       struct gma_connector *gma_connector;
 
-       psb_connector = to_psb_intel_connector(connector);
+       gma_connector = to_gma_connector(connector);
 
-       return container_of(psb_connector, struct mdfld_dsi_connector, base);
+       return container_of(gma_connector, struct mdfld_dsi_connector, base);
 }
 
 static inline struct mdfld_dsi_encoder *mdfld_dsi_encoder(
                struct drm_encoder *encoder)
 {
-       struct psb_intel_encoder *psb_encoder;
+       struct gma_encoder *gma_encoder;
 
-       psb_encoder = to_psb_intel_encoder(encoder);
+       gma_encoder = to_gma_encoder(encoder);
 
-       return container_of(psb_encoder, struct mdfld_dsi_encoder, base);
+       return container_of(gma_encoder, struct mdfld_dsi_encoder, base);
 }
 
 static inline struct mdfld_dsi_config *