summaryrefslogtreecommitdiff
path: root/linux-core/dvo_ch7017.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-06-02 12:58:10 +1000
committerDave Airlie <airlied@redhat.com>2008-06-02 12:58:10 +1000
commiteba6cdc936cb33d929997ccb9bade6f75bb40670 (patch)
tree8fc95131e711155fe4e5613e5c0029cf71054e5e /linux-core/dvo_ch7017.c
parentefb48c6cf7bbb57e7b2ea6ce7671905e84384963 (diff)
parent7fec6c0e2a2457925b88ed3bd70d9defde77b81b (diff)
Merge branch 'modesetting-101-encoders' into modesetting-101
Diffstat (limited to 'linux-core/dvo_ch7017.c')
-rw-r--r--linux-core/dvo_ch7017.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/dvo_ch7017.c b/linux-core/dvo_ch7017.c
index 8349da1b..194a7af1 100644
--- a/linux-core/dvo_ch7017.c
+++ b/linux-core/dvo_ch7017.c
@@ -258,9 +258,9 @@ fail:
return false;
}
-static enum drm_output_status ch7017_detect(struct intel_dvo_device *dvo)
+static enum drm_connector_status ch7017_detect(struct intel_dvo_device *dvo)
{
- return output_status_unknown;
+ return connector_status_unknown;
}
static enum drm_mode_status ch7017_mode_valid(struct intel_dvo_device *dvo,