diff options
Diffstat (limited to 'drivers/video/fbdev/skeletonfb.c')
| -rw-r--r-- | drivers/video/fbdev/skeletonfb.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/fbdev/skeletonfb.c b/drivers/video/fbdev/skeletonfb.c index 304320ce6c6f..125df366e23a 100644 --- a/drivers/video/fbdev/skeletonfb.c +++ b/drivers/video/fbdev/skeletonfb.c @@ -42,6 +42,7 @@ * more details. */ +#include <linux/aperture.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h> @@ -669,6 +670,13 @@ static int xxxfb_probe(struct pci_dev *dev, const struct pci_device_id *ent) int cmap_len, retval; /* + * Remove firmware-based drivers that create resource conflicts. + */ + retval = aperture_remove_conflicting_pci_devices(pdev, "xxxfb"); + if (retval) + return retval; + + /* * Dynamically allocate info and par */ info = framebuffer_alloc(sizeof(struct xxx_par), device); |