drm/i915: fix HAS_BSD with a device info flag
authorXiang, Haihao <haihao.xiang@intel.com>
Thu, 16 Sep 2010 02:43:10 +0000 (10:43 +0800)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 21 Sep 2010 10:19:54 +0000 (11:19 +0100)
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h

Simple merge
Simple merge