Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / i915 / intel_acpi.c

diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c
index bae3edf956a444f1e39e30e39867db75ef33303d..f413899475e94b388526f8a036cc9c378a2ddcd4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c
@@ -9,6 +9,7 @@
 #include <acpi/acpi_drivers.h>
 
 #include "drmP.h"
+#include "i915_drv.h"
 
 #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */
 
@@ -182,8 +183,6 @@ static void intel_dsm_platform_mux_info(void)
                        DRM_DEBUG_DRIVER("  hpd mux info: %s\n",
                               intel_dsm_mux_type(info->buffer.pointer[3]));
                }
-       } else {
-               DRM_ERROR("MUX INFO call failed\n");
        }
 
 out: