From b32f2f0d66b0cc1882466392e8b995e909e6c053 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Thu, 15 Dec 2011 08:11:25 +0800
Subject: [PATCH] --- yaml --- r: 291951 b: refs/heads/master c:
 e290cf276bc2a6cdcb360fd72b7a6a24539505fc h: refs/heads/master i:   291949:
 6e718a799377ab314fcbea4b661a0d827671589f   291947:
 44cf451d6921d880198ef75cb929186f43bb7447   291943:
 c1d3f58bfac7fe08ee1898bb2f7ac0a99fc9a6f4   291935:
 6dc69dd24b01e155239a41557a8c2d4acf8b84d4 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/spi/spi-dw-pci.c       | 2 +-
 trunk/drivers/spi/spi-pxa2xx-pci.c   | 2 +-
 trunk/drivers/spi/spi-topcliff-pch.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2459d97bab5e..ddc248629c6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b42dfed83d95a3c9e9cbd708f1993a7474abb79a
+refs/heads/master: e290cf276bc2a6cdcb360fd72b7a6a24539505fc
diff --git a/trunk/drivers/spi/spi-dw-pci.c b/trunk/drivers/spi/spi-dw-pci.c
index f64250ea1611..14f7cc9523f0 100644
--- a/trunk/drivers/spi/spi-dw-pci.c
+++ b/trunk/drivers/spi/spi-dw-pci.c
@@ -149,7 +149,7 @@ static int spi_resume(struct pci_dev *pdev)
 #define spi_resume	NULL
 #endif
 
-static const struct pci_device_id pci_ids[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
 	/* Intel MID platform SPI controller 0 */
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
 	{},
diff --git a/trunk/drivers/spi/spi-pxa2xx-pci.c b/trunk/drivers/spi/spi-pxa2xx-pci.c
index 8caa07d58e69..3fb44afe27b4 100644
--- a/trunk/drivers/spi/spi-pxa2xx-pci.c
+++ b/trunk/drivers/spi/spi-pxa2xx-pci.c
@@ -151,7 +151,7 @@ static void __devexit ce4100_spi_remove(struct pci_dev *dev)
 	kfree(spi_info);
 }
 
-static struct pci_device_id ce4100_spi_devices[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(ce4100_spi_devices) = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e6a) },
 	{ },
 };
diff --git a/trunk/drivers/spi/spi-topcliff-pch.c b/trunk/drivers/spi/spi-topcliff-pch.c
index 88e6b3fd1f12..4a5fafb8d574 100644
--- a/trunk/drivers/spi/spi-topcliff-pch.c
+++ b/trunk/drivers/spi/spi-topcliff-pch.c
@@ -216,7 +216,7 @@ struct pch_pd_dev_save {
 	struct pch_spi_board_data *board_dat;
 };
 
-static struct pci_device_id pch_spi_pcidev_id[] = {
+static DEFINE_PCI_DEVICE_TABLE(pch_spi_pcidev_id) = {
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI),    1, },
 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, },
 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, },