diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:55:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:55:23 -0400 |
| commit | 7bbedd521310547ca73cc77adcf61fb85723adc3 (patch) | |
| tree | f759d90c46bfbc48a9f396c9c6f839da11cdc6aa /drivers/net/irda | |
| parent | f44702f49056c203341badaa2cb8a706160d9119 (diff) | |
| parent | a04ce0ffcaf561994ecf382cd3caad75556dc499 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
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 | ||