From 12cbe1365b38ae04ad4979123eb5b4e9538ee533 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 15 Nov 2007 16:51:35 +1100 Subject: intel: fixup || vs | --- linux-core/intel_crt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3