git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-misc-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_drv.c
diff --git
a/drivers/gpu/drm/radeon/radeon_drv.c
b/drivers/gpu/drm/radeon/radeon_drv.c
index d0bc91ed7c90a73b898e57a6a77a4786c11ed169..19590fff135c3139a98bcf4f6f5ed739f4d7b2e7 100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_drv.c
+++ b/
drivers/gpu/drm/radeon/radeon_drv.c
@@
-361,7
+361,7
@@
static int radeon_pci_probe(struct pci_dev *pdev,
return -EPROBE_DEFER;
/* Get rid of things like offb */
- ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev,
0,
"radeondrmfb");
+ ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "radeondrmfb");
if (ret)
return ret;