Merge ../linux-2.6

[safe/jmp/linux-2.6] / drivers / video / riva / fbdev.c

diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index b7bd6bb..3e9308f 100644 (file)
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -2073,8 +2073,6 @@ static void __exit rivafb_remove(struct pci_dev *pd)
        struct riva_par *par = info->par;
        
        NVTRACE_ENTER();
-       if (!info)
-               return;
 
 #ifdef CONFIG_FB_RIVA_I2C
        riva_delete_i2c_busses(par);