Merge tag 'drm-next-2022-10-05' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-block.git] / drivers / video / fbdev / cyber2000fb.c

diff --git a/drivers/video/fbdev/cyber2000fb.c b/drivers/video/fbdev/cyber2000fb.c
index 8f041f9b14c7103d72b70b5ceca3560a91ccc995..585af90a68a5f1c0f06c9101f0bcddf6938bc1ff 100644 (file)
--- a/drivers/video/fbdev/cyber2000fb.c
+++ b/drivers/video/fbdev/cyber2000fb.c
@@ -33,6 +33,7 @@
  * (which, incidentally, is about the same saving as a 2.5in hard disk
  * entering standby mode.)
  */
+#include <linux/aperture.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -1720,6 +1721,10 @@ static int cyberpro_pci_probe(struct pci_dev *dev,
 
        sprintf(name, "CyberPro%4X", id->device);
 
+       err = aperture_remove_conflicting_pci_devices(dev, name);
+       if (err)
+               return err;
+
        err = pci_enable_device(dev);
        if (err)
                return err;