projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/aperture: Convert drivers to aperture interfaces
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
bochs
/
bochs_drv.c
diff --git
a/drivers/gpu/drm/bochs/bochs_drv.c
b/drivers/gpu/drm/bochs/bochs_drv.c
index
b469624
..
c828cad
100644
(file)
--- a/
drivers/gpu/drm/bochs/bochs_drv.c
+++ b/
drivers/gpu/drm/bochs/bochs_drv.c
@@
-6,6
+6,7
@@
#include <linux/pci.h>
#include <drm/drm_drv.h>
#include <linux/pci.h>
#include <drm/drm_drv.h>
+#include <drm/drm_aperture.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_managed.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_managed.h>
@@
-109,7
+110,7
@@
static int bochs_pci_probe(struct pci_dev *pdev,
return -ENOMEM;
}
return -ENOMEM;
}
- ret = drm_
fb_helper
_remove_conflicting_pci_framebuffers(pdev, "bochsdrmfb");
+ ret = drm_
aperture
_remove_conflicting_pci_framebuffers(pdev, "bochsdrmfb");
if (ret)
return ret;
if (ret)
return ret;