diff options
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-dw-pci.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi-pxa2xx-pci.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi-topcliff-pch.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c index 66fa9955ea14..f7be4be59353 100644 --- a/drivers/spi/spi-dw-pci.c +++ b/drivers/spi/spi-dw-pci.c | |||
@@ -148,7 +148,7 @@ static int spi_resume(struct pci_dev *pdev) | |||
148 | #define spi_resume NULL | 148 | #define spi_resume NULL |
149 | #endif | 149 | #endif |
150 | 150 | ||
151 | static DEFINE_PCI_DEVICE_TABLE(pci_ids) = { | 151 | static const struct pci_device_id pci_ids[] = { |
152 | /* Intel MID platform SPI controller 0 */ | 152 | /* Intel MID platform SPI controller 0 */ |
153 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) }, | 153 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) }, |
154 | {}, | 154 | {}, |
diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c index 74bc18775658..3f006d3ed2a8 100644 --- a/drivers/spi/spi-pxa2xx-pci.c +++ b/drivers/spi/spi-pxa2xx-pci.c | |||
@@ -62,7 +62,7 @@ static void ce4100_spi_remove(struct pci_dev *dev) | |||
62 | platform_device_unregister(pdev); | 62 | platform_device_unregister(pdev); |
63 | } | 63 | } |
64 | 64 | ||
65 | static DEFINE_PCI_DEVICE_TABLE(ce4100_spi_devices) = { | 65 | static const struct pci_device_id ce4100_spi_devices[] = { |
66 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e6a) }, | 66 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e6a) }, |
67 | { }, | 67 | { }, |
68 | }; | 68 | }; |
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index 446131308acb..338fc11913c1 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c | |||
@@ -217,7 +217,7 @@ struct pch_pd_dev_save { | |||
217 | struct pch_spi_board_data *board_dat; | 217 | struct pch_spi_board_data *board_dat; |
218 | }; | 218 | }; |
219 | 219 | ||
220 | static DEFINE_PCI_DEVICE_TABLE(pch_spi_pcidev_id) = { | 220 | static const struct pci_device_id pch_spi_pcidev_id[] = { |
221 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI), 1, }, | 221 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI), 1, }, |
222 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, }, | 222 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, }, |
223 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, }, | 223 | { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, }, |