diff options
Diffstat (limited to 'drivers/gpu/drm/gma500/oaktrail_hdmi.c')
-rw-r--r-- | drivers/gpu/drm/gma500/oaktrail_hdmi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c index 059de197c942..846817fe95ce 100644 --- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c +++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c | |||
@@ -641,7 +641,7 @@ void oaktrail_hdmi_init(struct drm_device *dev, | |||
641 | struct psb_intel_mode_device *mode_dev) | 641 | struct psb_intel_mode_device *mode_dev) |
642 | { | 642 | { |
643 | struct psb_intel_encoder *psb_intel_encoder; | 643 | struct psb_intel_encoder *psb_intel_encoder; |
644 | struct psb_intel_connector *psb_intel_connector; | 644 | struct gma_connector *gma_connector; |
645 | struct drm_connector *connector; | 645 | struct drm_connector *connector; |
646 | struct drm_encoder *encoder; | 646 | struct drm_encoder *encoder; |
647 | 647 | ||
@@ -649,11 +649,11 @@ void oaktrail_hdmi_init(struct drm_device *dev, | |||
649 | if (!psb_intel_encoder) | 649 | if (!psb_intel_encoder) |
650 | return; | 650 | return; |
651 | 651 | ||
652 | psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL); | 652 | gma_connector = kzalloc(sizeof(struct gma_connector), GFP_KERNEL); |
653 | if (!psb_intel_connector) | 653 | if (!gma_connector) |
654 | goto failed_connector; | 654 | goto failed_connector; |
655 | 655 | ||
656 | connector = &psb_intel_connector->base; | 656 | connector = &gma_connector->base; |
657 | encoder = &psb_intel_encoder->base; | 657 | encoder = &psb_intel_encoder->base; |
658 | drm_connector_init(dev, connector, | 658 | drm_connector_init(dev, connector, |
659 | &oaktrail_hdmi_connector_funcs, | 659 | &oaktrail_hdmi_connector_funcs, |
@@ -663,7 +663,7 @@ void oaktrail_hdmi_init(struct drm_device *dev, | |||
663 | &oaktrail_hdmi_enc_funcs, | 663 | &oaktrail_hdmi_enc_funcs, |
664 | DRM_MODE_ENCODER_TMDS); | 664 | DRM_MODE_ENCODER_TMDS); |
665 | 665 | ||
666 | gma_connector_attach_encoder(psb_intel_connector, psb_intel_encoder); | 666 | gma_connector_attach_encoder(gma_connector, psb_intel_encoder); |
667 | 667 | ||
668 | psb_intel_encoder->type = INTEL_OUTPUT_HDMI; | 668 | psb_intel_encoder->type = INTEL_OUTPUT_HDMI; |
669 | drm_encoder_helper_add(encoder, &oaktrail_hdmi_helper_funcs); | 669 | drm_encoder_helper_add(encoder, &oaktrail_hdmi_helper_funcs); |