diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-07-16 22:22:20 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-08 17:57:23 -0400 |
commit | 982245f01734e9d5a3ab98b2b2e9761ae7719094 (patch) | |
tree | 96ff56ff327f9a50f91a46886967f349d9a0a5e7 /drivers/net/irda | |
parent | 74d863ee8a9da2b0f31e0f977daf127807b2e9d2 (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/net/irda')
-rw-r--r-- | drivers/net/irda/vlsi_ir.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h index 414694abf588..741aecc655df 100644 --- a/drivers/net/irda/vlsi_ir.h +++ b/drivers/net/irda/vlsi_ir.h | |||
@@ -69,14 +69,8 @@ typedef void irqreturn_t; | |||
69 | 69 | ||
70 | #else /* 2.5 or later */ | 70 | #else /* 2.5 or later */ |
71 | 71 | ||
72 | /* recent 2.5/2.6 stores pci device names at varying places ;-) */ | ||
73 | #ifdef CONFIG_PCI_NAMES | ||
74 | /* human readable name */ | ||
75 | #define PCIDEV_NAME(pdev) ((pdev)->pretty_name) | ||
76 | #else | ||
77 | /* whatever we get from the associated struct device - bus:slot:dev.fn id */ | 72 | /* whatever we get from the associated struct device - bus:slot:dev.fn id */ |
78 | #define PCIDEV_NAME(pdev) (pci_name(pdev)) | 73 | #define PCIDEV_NAME(pdev) (pci_name(pdev)) |
79 | #endif | ||
80 | 74 | ||
81 | #endif | 75 | #endif |
82 | 76 | ||