drm/radeon/kms: merge conflicted badly

Browse source

Not sure why git didn't flag this, but the result of automerge
from 3.14-rc7 screwed up the radeon init procedure.

Reported-by: Fireburn on #radeon
Signed-off-by: Dave Airlie <airlied@redhat.com>

...

This commit is contained in:

Dave Airlie 2014-03-20 11:08:11 +10:00

parent 5a08c07526

commit e84c20aff1

1 changed files with 0 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/gpu/drm/radeon/radeon_kms.c

View file