From c448f14c7a89816951c8e7c7f5a8b8ab6aa613b4 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:25:19 -0500
Subject: [PATCH] --- yaml --- r: 338451 b: refs/heads/master c:
 512f82a064e397e437845c3f03a3c6dc3e610e8b h: refs/heads/master i:   338449:
 c0245cbda4b6a07171c47bde34644584a35e578e   338447:
 3e7b483e383b441d6a2f6becc80f57abd8bddbbf v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/tty/nozomi.c              | 2 +-
 trunk/drivers/tty/serial/8250/8250_em.c | 2 +-
 trunk/drivers/tty/serial/mfd.c          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 18d962f1dba6..0ff844997dac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de88b34042752c03771b779d1d985060909ab44a
+refs/heads/master: 512f82a064e397e437845c3f03a3c6dc3e610e8b
diff --git a/trunk/drivers/tty/nozomi.c b/trunk/drivers/tty/nozomi.c
index 61de2a465473..2445aa4d2fa4 100644
--- a/trunk/drivers/tty/nozomi.c
+++ b/trunk/drivers/tty/nozomi.c
@@ -400,7 +400,7 @@ struct buffer {
 } __attribute__ ((packed));
 
 /*    Global variables */
-static const struct pci_device_id nozomi_pci_tbl[] __devinitconst = {
+static const struct pci_device_id nozomi_pci_tbl[] = {
 	{PCI_DEVICE(0x1931, 0x000c)},	/* Nozomi HSDPA */
 	{},
 };
diff --git a/trunk/drivers/tty/serial/8250/8250_em.c b/trunk/drivers/tty/serial/8250/8250_em.c
index f59bff5907c1..430bf42374c0 100644
--- a/trunk/drivers/tty/serial/8250/8250_em.c
+++ b/trunk/drivers/tty/serial/8250/8250_em.c
@@ -163,7 +163,7 @@ static int __devexit serial8250_em_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static const struct of_device_id serial8250_em_dt_ids[] __devinitconst = {
+static const struct of_device_id serial8250_em_dt_ids[] = {
 	{ .compatible = "renesas,em-uart", },
 	{},
 };
diff --git a/trunk/drivers/tty/serial/mfd.c b/trunk/drivers/tty/serial/mfd.c
index 8a74d59270eb..2c01344dc332 100644
--- a/trunk/drivers/tty/serial/mfd.c
+++ b/trunk/drivers/tty/serial/mfd.c
@@ -1459,7 +1459,7 @@ static void serial_hsu_remove(struct pci_dev *pdev)
 }
 
 /* First 3 are UART ports, and the 4th is the DMA */
-static const struct pci_device_id pci_ids[] __devinitconst = {
+static const struct pci_device_id pci_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081B) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081C) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) },