diff options
author | Dave Airlie <airlied@linux.ie> | 2008-07-26 08:38:59 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-07-26 08:38:59 +1000 |
commit | fb05c4d621084d7a3fb3dd52d7d9c888eac852d0 (patch) | |
tree | bca43a3c777984e0eb962d55817541801377d3c4 /linux-core/intel_crt.c | |
parent | 2556341f8baf0e0b7b5f7843135e43e662751af0 (diff) | |
parent | 53428453758621da70d9608c9baec58b4b9383ec (diff) |
Merge remote branch 'origin/modesetting-101' into modesetting-gem
Diffstat (limited to 'linux-core/intel_crt.c')
-rw-r--r-- | linux-core/intel_crt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/intel_crt.c b/linux-core/intel_crt.c index 2ed1cb79..2505d983 100644 --- a/linux-core/intel_crt.c +++ b/linux-core/intel_crt.c @@ -210,7 +210,7 @@ static int intel_crt_get_modes(struct drm_connector *connector) return intel_ddc_get_modes(intel_output); } -static bool intel_crt_set_property(struct drm_connector *connector, +static int intel_crt_set_property(struct drm_connector *connector, struct drm_property *property, uint64_t value) { @@ -219,7 +219,7 @@ static bool intel_crt_set_property(struct drm_connector *connector, if (property == dev->mode_config.dpms_property && connector->encoder) intel_crt_dpms(connector->encoder, (uint32_t)(value & 0xf)); - return true; + return 0; } /* |