Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-block.git] / drivers / video / geode / gxfb_core.c

diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 89c34b15f5d4f748de01fdb76755b169c75af92d..0d3643fc6293ba76880b371779288f99d46306c4 100644 (file)
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -25,7 +25,6 @@
 #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>
@@ -354,8 +353,6 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
                pci_release_region(pdev, 2);
        }
 
-       pci_disable_device(pdev);
-
        if (info)
                framebuffer_release(info);
        return ret;
@@ -377,7 +374,6 @@ static void gxfb_remove(struct pci_dev *pdev)
        iounmap(par->dc_regs);
        pci_release_region(pdev, 2);
 
-       pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);
 
        framebuffer_release(info);