CONFIG_HOTPLUG is going away as an option so __devinitdata is no
longer needed.
Signed-off-by: Bill Pemberton wf...@virginia.edu
Cc: James E.J. Bottomley jbottom...@parallels.com
Cc: Matthew Wilcox matt...@wil.cx
Cc: Juergen E. Fischer fisc...@norbit.de
Cc: Oliver Neukum oli...@neukum.org
Cc: Ali Akcaagac ali...@web.de
Cc: Jamie Lenehan lene...@twibble.org
Cc: GOTO Masanori go...@debian.or.jp
Cc: YOKOTA Hiroshi yok...@netlab.is.tsukuba.ac.jp
Cc: Kurt Garloff garl...@suse.de
Cc: Guennadi Liakhovetski g.liakhovet...@gmx.de
Cc: linux-scsi@vger.kernel.org
Cc: dc3...@twibble.org
---
drivers/scsi/3w-9xxx.c | 2 +-
drivers/scsi/3w-sas.c | 2 +-
drivers/scsi/3w-.c | 2 +-
drivers/scsi/BusLogic.c | 2 +-
drivers/scsi/NCR_D700.c | 2 +-
drivers/scsi/a2091.c| 2 +-
drivers/scsi/advansys.c | 16
drivers/scsi/aha152x.c | 2 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
drivers/scsi/bnx2i/bnx2i_init.c | 2 +-
drivers/scsi/dc395x.c | 4 ++--
drivers/scsi/fdomain.c | 2 +-
drivers/scsi/g_NCR5380.c| 2 +-
drivers/scsi/gvp11.c| 2 +-
drivers/scsi/ibmvscsi/ibmvfc.c | 2 +-
drivers/scsi/ibmvscsi/ibmvscsi.c| 2 +-
drivers/scsi/ibmvscsi/ibmvstgt.c| 2 +-
drivers/scsi/ipr.c | 2 +-
drivers/scsi/mvsas/mv_init.c| 2 +-
drivers/scsi/nsp32.c| 2 +-
drivers/scsi/pm8001/pm8001_init.c | 2 +-
drivers/scsi/pmcraid.c | 2 +-
drivers/scsi/sym53c416.c| 2 +-
drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +-
drivers/scsi/tmscsim.c | 2 +-
drivers/scsi/zorro7xx.c | 4 ++--
26 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 78c1fcc..d1f0120 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -2305,7 +2305,7 @@ out_disable_device:
#endif
/* PCI Devices supported by this driver */
-static struct pci_device_id twa_pci_tbl[] __devinitdata = {
+static struct pci_device_id twa_pci_tbl[] = {
{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9000,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9550SX,
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index 7b97f52..52a2f058 100644
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -1893,7 +1893,7 @@ out_disable_device:
#endif
/* PCI Devices supported by this driver */
-static struct pci_device_id twl_pci_tbl[] __devinitdata = {
+static struct pci_device_id twl_pci_tbl[] = {
{ PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9750) },
{ }
};
diff --git a/drivers/scsi/3w-.c b/drivers/scsi/3w-.c
index 601546b..62071d2 100644
--- a/drivers/scsi/3w-.c
+++ b/drivers/scsi/3w-.c
@@ -2422,7 +2422,7 @@ static void tw_remove(struct pci_dev *pdev)
} /* End tw_remove() */
/* PCI Devices supported by this driver */
-static struct pci_device_id tw_pci_tbl[] __devinitdata = {
+static struct pci_device_id tw_pci_tbl[] = {
{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_1000,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_7000,
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index d4da370..d7ca247 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -3615,7 +3615,7 @@ static void __exit BusLogic_exit(void)
__setup(BusLogic=, BusLogic_Setup);
#ifdef MODULE
-static struct pci_device_id BusLogic_pci_tbl[] __devinitdata = {
+static struct pci_device_id BusLogic_pci_tbl[] = {
{ PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC,
diff --git a/drivers/scsi/NCR_D700.c b/drivers/scsi/NCR_D700.c
index 37028d3..86b3533 100644
--- a/drivers/scsi/NCR_D700.c
+++ b/drivers/scsi/NCR_D700.c
@@ -114,7 +114,7 @@ MODULE_DESCRIPTION(NCR Dual700 SCSI Driver);
MODULE_LICENSE(GPL);
module_param(NCR_D700, charp, 0);
-static __u8 __devinitdata id_array[2*(MCA_MAX_SLOT_NR + 1)] =
+static __u8 id_array[2*(MCA_MAX_SLOT_NR + 1)] =
{ [0 ... 2*(MCA_MAX_SLOT_NR + 1)-1] = 7 };
#ifdef MODULE
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 78f1035..7c6e9aa 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -251,7 +251,7 @@ static void __devexit a2091_remove(struct zorro_dev *z)
release_mem_region(z-resource.start, 256);
}
-static struct zorro_device_id a2091_zorro_tbl[] __devinitdata = {
+static struct zorro_device_id a2091_zorro_tbl[] = {
{ ZORRO_PROD_CBM_A590_A2091_1 },
{ ZORRO_PROD_CBM_A590_A2091_2 },
{ 0 }
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 286db72..409e2a4 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c