Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / video / cirrusfb.c

diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index daf43f5..1103010 100644 (file)
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -36,11 +36,13 @@
 
 #define CIRRUSFB_VERSION "2.0-pre2"
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
+#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
@@ -2225,6 +2227,7 @@ static void cirrusfb_pci_unmap (struct cirrusfb_info *cinfo)
                release_region(0x3C0, 32);
        pci_release_regions(pdev);
        framebuffer_release(cinfo->info);
+       pci_disable_device(pdev);
 }
 #endif /* CONFIG_PCI */
 
@@ -2455,6 +2458,7 @@ err_release_regions:
 err_release_fb:
        framebuffer_release(info);
 err_disable:
+       pci_disable_device(pdev);
 err_out:
        return ret;
 }