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_tfp410.c | |
| parent | efb48c6cf7bbb57e7b2ea6ce7671905e84384963 (diff) | |
| parent | 7fec6c0e2a2457925b88ed3bd70d9defde77b81b (diff) | |
Merge branch 'modesetting-101-encoders' into modesetting-101
Diffstat (limited to 'linux-core/dvo_tfp410.c')
| -rw-r--r-- | linux-core/dvo_tfp410.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/dvo_tfp410.c b/linux-core/dvo_tfp410.c index 64448509..c1d1aa96 100644 --- a/linux-core/dvo_tfp410.c +++ b/linux-core/dvo_tfp410.c @@ -207,16 +207,16 @@ out: return false; } -static enum drm_output_status tfp410_detect(struct intel_dvo_device *dvo) +static enum drm_connector_status tfp410_detect(struct intel_dvo_device *dvo) { - enum drm_output_status ret = output_status_disconnected; + enum drm_connector_status ret = connector_status_disconnected; uint8_t ctl2; if (tfp410_readb(dvo, TFP410_CTL_2, &ctl2)) { if (ctl2 & TFP410_CTL_2_HTPLG) - ret = output_status_connected; + ret = connector_status_connected; else - ret = output_status_disconnected; + ret = connector_status_disconnected; } return ret; |