]> bbs.cooldavid.org Git - net-next-2.6.git/commit - drivers/gpu/drm/drm_crtc_helper.c
drm/crtc: fix mismerge of last patch.
authorDave Airlie <airlied@linux.ie>
Wed, 2 Sep 2009 04:00:11 +0000 (14:00 +1000)
committerDave Airlie <airlied@linux.ie>
Wed, 2 Sep 2009 04:00:11 +0000 (14:00 +1000)
commit9c552dd79346f86a3b53e41255c92c6f560b80fb
treed7cc9c5d9987ef2bdf36c821b60b7ebf7eee38d3
parenta3a0544b2c84e1d7a2022b558ecf66d8c6a8dd93
drm/crtc: fix mismerge of last patch.

We only want to NULL encoder->crtc when it is off.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_crtc_helper.c