aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:25:19 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 18:26:22 -0500
commit512f82a064e397e437845c3f03a3c6dc3e610e8b (patch)
tree4a7d35083e0c8bb75256f7a871a14f580030e48c
parentde88b34042752c03771b779d1d985060909ab44a (diff)
tty: remove use of __devinitconst
CONFIG_HOTPLUG is going away as an option so __devinitconst is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/nozomi.c2
-rw-r--r--drivers/tty/serial/8250/8250_em.c2
-rw-r--r--drivers/tty/serial/mfd.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index 61de2a465473..2445aa4d2fa4 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -400,7 +400,7 @@ struct buffer {
400} __attribute__ ((packed)); 400} __attribute__ ((packed));
401 401
402/* Global variables */ 402/* Global variables */
403static const struct pci_device_id nozomi_pci_tbl[] __devinitconst = { 403static const struct pci_device_id nozomi_pci_tbl[] = {
404 {PCI_DEVICE(0x1931, 0x000c)}, /* Nozomi HSDPA */ 404 {PCI_DEVICE(0x1931, 0x000c)}, /* Nozomi HSDPA */
405 {}, 405 {},
406}; 406};
diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c
index f59bff5907c1..430bf42374c0 100644
--- a/drivers/tty/serial/8250/8250_em.c
+++ b/drivers/tty/serial/8250/8250_em.c
@@ -163,7 +163,7 @@ static int __devexit serial8250_em_remove(struct platform_device *pdev)
163 return 0; 163 return 0;
164} 164}
165 165
166static const struct of_device_id serial8250_em_dt_ids[] __devinitconst = { 166static const struct of_device_id serial8250_em_dt_ids[] = {
167 { .compatible = "renesas,em-uart", }, 167 { .compatible = "renesas,em-uart", },
168 {}, 168 {},
169}; 169};
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index 8a74d59270eb..2c01344dc332 100644
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -1459,7 +1459,7 @@ static void serial_hsu_remove(struct pci_dev *pdev)
1459} 1459}
1460 1460
1461/* First 3 are UART ports, and the 4th is the DMA */ 1461/* First 3 are UART ports, and the 4th is the DMA */
1462static const struct pci_device_id pci_ids[] __devinitconst = { 1462static const struct pci_device_id pci_ids[] = {
1463 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081B) }, 1463 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081B) },
1464 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081C) }, 1464 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081C) },
1465 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) }, 1465 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) },