diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-06-02 12:58:10 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-06-02 12:58:10 +1000 |
| commit | eba6cdc936cb33d929997ccb9bade6f75bb40670 (patch) | |
| tree | 8fc95131e711155fe4e5613e5c0029cf71054e5e /linux-core/dvo_ivch.c | |
| parent | efb48c6cf7bbb57e7b2ea6ce7671905e84384963 (diff) | |
| parent | 7fec6c0e2a2457925b88ed3bd70d9defde77b81b (diff) | |
Merge branch 'modesetting-101-encoders' into modesetting-101
Diffstat (limited to 'linux-core/dvo_ivch.c')
| -rw-r--r-- | linux-core/dvo_ivch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/dvo_ivch.c b/linux-core/dvo_ivch.c index 9209dd02..7ba00b34 100644 --- a/linux-core/dvo_ivch.c +++ b/linux-core/dvo_ivch.c @@ -297,9 +297,9 @@ out: return false; } -static enum drm_output_status ivch_detect(struct intel_dvo_device *dvo) +static enum drm_connector_status ivch_detect(struct intel_dvo_device *dvo) { - return output_status_connected; + return connector_status_connected; } static enum drm_mode_status ivch_mode_valid(struct intel_dvo_device *dvo, |