aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-07-16 22:22:20 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-08 17:57:23 -0400
commit982245f01734e9d5a3ab98b2b2e9761ae7719094 (patch)
tree96ff56ff327f9a50f91a46886967f349d9a0a5e7 /drivers/video
parent74d863ee8a9da2b0f31e0f977daf127807b2e9d2 (diff)
[PATCH] PCI: remove CONFIG_PCI_NAMES
This patch removes CONFIG_PCI_NAMES. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/nvidia/nvidia.c4
-rw-r--r--drivers/video/riva/fbdev.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 52b16850a54e..30f80c23f934 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1473,10 +1473,6 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
1473 par->Chipset = (pd->vendor << 16) | pd->device; 1473 par->Chipset = (pd->vendor << 16) | pd->device;
1474 printk(KERN_INFO PFX "nVidia device/chipset %X\n", par->Chipset); 1474 printk(KERN_INFO PFX "nVidia device/chipset %X\n", par->Chipset);
1475 1475
1476#ifdef CONFIG_PCI_NAMES
1477 printk(KERN_INFO PFX "%s\n", pd->pretty_name);
1478#endif
1479
1480 if (par->Architecture == 0) { 1476 if (par->Architecture == 0) {
1481 printk(KERN_ERR PFX "unknown NV_ARCH\n"); 1477 printk(KERN_ERR PFX "unknown NV_ARCH\n");
1482 goto err_out_free_base0; 1478 goto err_out_free_base0;
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,
1936 default_par->Chipset = (pd->vendor << 16) | pd->device; 1936 default_par->Chipset = (pd->vendor << 16) | pd->device;
1937 printk(KERN_INFO PFX "nVidia device/chipset %X\n",default_par->Chipset); 1937 printk(KERN_INFO PFX "nVidia device/chipset %X\n",default_par->Chipset);
1938 1938
1939#ifdef CONFIG_PCI_NAMES
1940 printk(KERN_INFO PFX "%s\n", pd->pretty_name);
1941#endif
1942
1943 if(default_par->riva.Architecture == 0) { 1939 if(default_par->riva.Architecture == 0) {
1944 printk(KERN_ERR PFX "unknown NV_ARCH\n"); 1940 printk(KERN_ERR PFX "unknown NV_ARCH\n");
1945 ret=-ENODEV; 1941 ret=-ENODEV;