diff options
author | Dave Airlie <airlied@redhat.com> | 2015-01-13 07:38:53 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-01-13 07:38:53 +1000 |
commit | 426959c945538bace94ccc590d8630c02ecd6b0f (patch) | |
tree | 81df16530e078126e3f6452a8d3d07b6ea376874 /drivers/atm/horizon.h | |
parent | adc31849b27fefeca6c225d3895143a2ec6970fa (diff) |
drm: fix mismerge in drm_crtc.c
Daniel merged two things in 72a3697097b8dc92f5b8362598f5730a9986eb83,
but he merged this code twice, Dan's static checker spotted it.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/atm/horizon.h')
0 files changed, 0 insertions, 0 deletions