drm/edid: fix collision between two patches breaking build
authorDave Airlie <airlied@redhat.com>
Mon, 30 Apr 2012 06:26:16 +0000 (07:26 +0100)
committerDave Airlie <airlied@redhat.com>
Mon, 30 Apr 2012 06:26:16 +0000 (07:26 +0100)
commit2baf8377997cce10bb730f306392f29794dea217
treeaf8c575227a5ef1f30af83f3da29dea35c93c290
parentf7f6c340f9d8f11bee50aef647b8578348957936
drm/edid: fix collision between two patches breaking build

this fixes a report that the new load code needed to be updated for
ajax's validity changes.

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