diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-26 08:51:21 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:12:57 +1000 |
| commit | c0077061e7ea3a8c1c316c87a79976bf8f00beb5 (patch) | |
| tree | 8e9219dafef3c0c04ceb15be8fe04ffba0b1649d /drivers/gpu/drm/nouveau/nouveau_connector.c | |
| parent | d38ac5217ab43cf61e8ebe6d7114fb2d1ca9a3a4 (diff) | |
| download | talos-obmc-linux-c0077061e7ea3a8c1c316c87a79976bf8f00beb5.tar.gz talos-obmc-linux-c0077061e7ea3a8c1c316c87a79976bf8f00beb5.zip | |
drm/nouveau/acpi: move definitions out of nouveau_drv.h
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_connector.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index bd0985a4ff64..5dbf2e45993d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -36,6 +36,7 @@ #include "nouveau_crtc.h" #include "nouveau_connector.h" #include "nouveau_hw.h" +#include "nouveau_acpi.h" #include <subdev/bios/gpio.h> @@ -335,7 +336,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force) * valid - it's not (rh#613284) */ if (nv_encoder->dcb->lvdsconf.use_acpi_for_edid) { - if (!nouveau_acpi_edid(dev, connector)) { + if (!(nv_connector->edid = nouveau_acpi_edid(dev, connector))) { status = connector_status_connected; goto out; } |
