diff options
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/donauboe.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/via-ircc.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/vlsi_ir.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index 768dfe9a9315..9fd0c20488de 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c | |||
@@ -184,7 +184,7 @@ | |||
184 | #define CONFIG0H_DMA_ON_NORX CONFIG0H_DMA_OFF| OBOE_CONFIG0H_ENDMAC | 184 | #define CONFIG0H_DMA_ON_NORX CONFIG0H_DMA_OFF| OBOE_CONFIG0H_ENDMAC |
185 | #define CONFIG0H_DMA_ON CONFIG0H_DMA_ON_NORX | OBOE_CONFIG0H_ENRX | 185 | #define CONFIG0H_DMA_ON CONFIG0H_DMA_ON_NORX | OBOE_CONFIG0H_ENRX |
186 | 186 | ||
187 | static DEFINE_PCI_DEVICE_TABLE(toshoboe_pci_tbl) = { | 187 | static const struct pci_device_id toshoboe_pci_tbl[] = { |
188 | { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIR701, PCI_ANY_ID, PCI_ANY_ID, }, | 188 | { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIR701, PCI_ANY_ID, PCI_ANY_ID, }, |
189 | { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIRD01, PCI_ANY_ID, PCI_ANY_ID, }, | 189 | { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIRD01, PCI_ANY_ID, PCI_ANY_ID, }, |
190 | { } /* Terminating entry */ | 190 | { } /* Terminating entry */ |
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 998bb89ede71..36e004288ea7 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -115,7 +115,7 @@ static void iodelay(int udelay) | |||
115 | } | 115 | } |
116 | } | 116 | } |
117 | 117 | ||
118 | static DEFINE_PCI_DEVICE_TABLE(via_pci_tbl) = { | 118 | static const struct pci_device_id via_pci_tbl[] = { |
119 | { PCI_VENDOR_ID_VIA, 0x8231, PCI_ANY_ID, PCI_ANY_ID,0,0,0 }, | 119 | { PCI_VENDOR_ID_VIA, 0x8231, PCI_ANY_ID, PCI_ANY_ID,0,0,0 }, |
120 | { PCI_VENDOR_ID_VIA, 0x3109, PCI_ANY_ID, PCI_ANY_ID,0,0,1 }, | 120 | { PCI_VENDOR_ID_VIA, 0x3109, PCI_ANY_ID, PCI_ANY_ID,0,0,1 }, |
121 | { PCI_VENDOR_ID_VIA, 0x3074, PCI_ANY_ID, PCI_ANY_ID,0,0,2 }, | 121 | { PCI_VENDOR_ID_VIA, 0x3074, PCI_ANY_ID, PCI_ANY_ID,0,0,2 }, |
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 58ef59469dd0..a04af9d0f8f9 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
@@ -58,7 +58,7 @@ MODULE_LICENSE("GPL"); | |||
58 | 58 | ||
59 | static /* const */ char drivername[] = DRIVER_NAME; | 59 | static /* const */ char drivername[] = DRIVER_NAME; |
60 | 60 | ||
61 | static DEFINE_PCI_DEVICE_TABLE(vlsi_irda_table) = { | 61 | static const struct pci_device_id vlsi_irda_table[] = { |
62 | { | 62 | { |
63 | .class = PCI_CLASS_WIRELESS_IRDA << 8, | 63 | .class = PCI_CLASS_WIRELESS_IRDA << 8, |
64 | .class_mask = PCI_CLASS_SUBCLASS_MASK << 8, | 64 | .class_mask = PCI_CLASS_SUBCLASS_MASK << 8, |