Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

1 files changed, 0 insertions, 4 deletions

diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index ae297e222681..3e9f96e9237d 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1936,10 +1936,6 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
         default_par->Chipset = (pd->vendor << 16) | pd->device;
         printk(KERN_INFO PFX "nVidia device/chipset %X\n",default_par->Chipset);
         
-#ifdef CONFIG_PCI_NAMES
-        printk(KERN_INFO PFX "%s\n", pd->pretty_name);
-#endif
-
         if(default_par->riva.Architecture == 0) {
                 printk(KERN_ERR PFX "unknown NV_ARCH\n");
                 ret=-ENODEV;