Subject: linux-next: manual merge of the drm tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 5 Aug 2009 13:44:35 +1000

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_crtc.c between commit
7781de74568bddfefbd2d32a934a8c791a2420cd ("drm: Small logic fix in
drm_mode_setcrtc") from Linus' tree and commit
58367ed65f30128d8b763bf4c1fb942da49ade15 ("drm: Add the debug info in
generic drm mode by using DRM_DEBUG_KMS") from the drm tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/gpu/drm/drm_crtc.c
index 33be210,a8c8311..0000000
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@@ -1461,8 -1484,8 +1484,8 @@@ int drm_mode_setcrtc(struct drm_device 
  		goto out;
  	}
  
 -	if (crtc_req->count_connectors > 0 && !mode && !fb) {
 +	if (crtc_req->count_connectors > 0 && (!mode || !fb)) {
- 		DRM_DEBUG("Count connectors is %d but no mode or fb set\n",
+ 		DRM_DEBUG_KMS("Count connectors is %d but no mode or fb set\n",
  			  crtc_req->count_connectors);
  		ret = -EINVAL;
  		goto out;