diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-11-15 16:51:35 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-11-15 16:51:35 +1100 |
| commit | 12cbe1365b38ae04ad4979123eb5b4e9538ee533 (patch) | |
| tree | 7d2446ca9c7f99b2091f27fa622c4c668dbb4f34 /linux-core | |
| parent | d275bb8fb87d8dc23e9a62c5f82627e36c8dc589 (diff) | |
intel: fixup || vs |
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/intel_crt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/intel_crt.c b/linux-core/intel_crt.c index d2e1f95c..29c2e611 100644 --- a/linux-core/intel_crt.c +++ b/linux-core/intel_crt.c @@ -177,7 +177,7 @@ static enum drm_output_status intel_crt_detect(struct drm_output *output) { struct drm_device *dev = output->dev; - if (IS_I945G(dev)| IS_I945GM(dev) || IS_I965G(dev)) { + if (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev)) { if (intel_crt_detect_hotplug(output)) return output_status_connected; else |