diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:55:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:55:23 -0700 |
| commit | 7bbedd521310547ca73cc77adcf61fb85723adc3 (patch) | |
| tree | f759d90c46bfbc48a9f396c9c6f839da11cdc6aa /drivers/net | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | [PATCH] PCI/libata INTx cleanup (diff) | |
| download | linux-dev-7bbedd521310547ca73cc77adcf61fb85723adc3.tar.xz linux-dev-7bbedd521310547ca73cc77adcf61fb85723adc3.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/net')
| -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; #else /* 2.5 or later */ -/* recent 2.5/2.6 stores pci device names at varying places ;-) */ -#ifdef CONFIG_PCI_NAMES -/* human readable name */ -#define PCIDEV_NAME(pdev) ((pdev)->pretty_name) -#else /* whatever we get from the associated struct device - bus:slot:dev.fn id */ #define PCIDEV_NAME(pdev) (pci_name(pdev)) -#endif #endif |