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.h | |
parent | efb48c6cf7bbb57e7b2ea6ce7671905e84384963 (diff) | |
parent | 7fec6c0e2a2457925b88ed3bd70d9defde77b81b (diff) |
Merge branch 'modesetting-101-encoders' into modesetting-101
Diffstat (limited to 'linux-core/dvo.h')
-rw-r--r-- | linux-core/dvo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/dvo.h b/linux-core/dvo.h index c6c1dbdb..b122ea1f 100644 --- a/linux-core/dvo.h +++ b/linux-core/dvo.h @@ -126,7 +126,7 @@ struct intel_dvo_dev_ops { /* * Probe for a connected output, and return detect_status. */ - enum drm_output_status (*detect)(struct intel_dvo_device *dvo); + enum drm_connector_status (*detect)(struct intel_dvo_device *dvo); /** * Query the device for the modes it provides. |