linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, James.Bottomley@HansenPartnership.com,
	Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 25/31] sections: Fix section conflicts in drivers/scsi
Date: Sat, 18 Aug 2012 10:30:16 -0700	[thread overview]
Message-ID: <1345311022-26328-26-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1345311022-26328-1-git-send-email-andi@firstfloor.org>

From: Andi Kleen <ak@linux.intel.com>

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 drivers/scsi/aacraid/linit.c        |    2 +-
 drivers/scsi/aic94xx/aic94xx_init.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 7199534..cb7f158 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
 #elif defined(__devinitconst)
 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
 #else
-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
 #endif
 	{ 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
 	{ 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index ff80552..1c4120c 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
 	.lldd_ata_set_dmamode	= asd_set_dmamode,
 };
 
-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
 	{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
 	{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
 	{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
-- 
1.7.7.6


  parent reply	other threads:[~2012-08-18 17:33 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-18 17:29 Const section fixes tree sweep Andi Kleen
2012-08-18 17:29 ` [PATCH 01/31] Disable const sections for PA-RISC Andi Kleen
2012-08-18 21:15   ` Sam Ravnborg
2012-08-19  2:07     ` Andi Kleen
2012-08-19  7:41       ` Sam Ravnborg
2012-08-18 17:29 ` [PATCH 02/31] sections: Fix section conflicts in arch/arm/ Andi Kleen
2012-08-18 17:29 ` [PATCH 03/31] sections: Fix section conflicts in arch/frv Andi Kleen
2012-10-11 12:38   ` Geert Uytterhoeven
2012-10-11 23:20     ` Andi Kleen
2012-10-15 11:13     ` David Howells
2012-08-18 17:29 ` [PATCH 04/31] sections: Fix section conflicts in arch/h8300 Andi Kleen
2012-08-18 17:29 ` [PATCH 05/31] sections: Fix section conflicts in arch/ia64 Andi Kleen
2012-08-18 17:29 ` [PATCH 06/31] sections: Fix section conflicts in arch/mips Andi Kleen
2012-08-18 17:29 ` [PATCH 07/31] sections: Fix section conflicts in arch/powerpc Andi Kleen
2012-08-18 17:29 ` [PATCH 08/31] sections: Fix section conflicts in arch/score Andi Kleen
2012-08-18 17:30 ` [PATCH 09/31] sections: Fix section conflicts in arch/sh Andi Kleen
2012-08-18 17:30 ` [PATCH 10/31] sections: Fix section conflicts in arch/x86 Andi Kleen
2012-08-18 17:30 ` [PATCH 11/31] sections: Fix section conflicts in drivers/atm Andi Kleen
2012-08-18 17:30 ` [PATCH 12/31] sections: Fix section conflicts in drivers/char Andi Kleen
2012-08-18 17:30 ` [PATCH 13/31] sections: Fix section conflicts in drivers/cpufreq Andi Kleen
2012-08-18 17:30 ` [PATCH 14/31] sections: Fix section conflicts in drivers/hwmon Andi Kleen
2012-08-18 23:23   ` Guenter Roeck
2012-08-19  1:59     ` Andi Kleen
2012-08-19  5:12       ` Guenter Roeck
2012-08-18 17:30 ` [PATCH 15/31] sections: Fix section conflicts in drivers/ide Andi Kleen
2012-08-18 17:30 ` [PATCH 16/31] sections: Fix section conflicts in drivers/macintosh Andi Kleen
2012-08-18 17:30 ` [PATCH 17/31] sections: Fix section conflicts in drivers/media Andi Kleen
2012-08-18 17:30 ` [PATCH 18/31] sections: Fix section conflicts in drivers/mfd Andi Kleen
2012-08-18 17:30 ` [PATCH 19/31] sections: Fix section conflicts in drivers/misc Andi Kleen
2012-08-18 17:30 ` [PATCH 20/31] sections: Fix section conflicts in drivers/mmc Andi Kleen
2012-08-18 17:30 ` [PATCH 21/31] sections: Fix section conflicts in drivers/net Andi Kleen
2012-08-18 17:30 ` [PATCH 22/31] sections: Fix section conflicts in drivers/net/hamradio Andi Kleen
2012-08-18 17:30 ` [PATCH 23/31] sections: Fix section conflicts in drivers/net/wan Andi Kleen
2012-08-18 17:30 ` [PATCH 24/31] sections: Fix section conflicts in drivers/platform/x86 Andi Kleen
2012-08-18 17:30 ` Andi Kleen [this message]
2012-08-18 17:30 ` [PATCH 26/31] sections: Fix section conflicts in drivers/video Andi Kleen
2012-08-18 17:30 ` [PATCH 27/31] sections: Fix section conflicts in mm/percpu Andi Kleen
2012-08-18 17:30 ` [PATCH 28/31] sections: Fix section conflicts in net/can Andi Kleen
2012-08-18 17:30 ` [PATCH 29/31] sections: Fix section conflicts in net Andi Kleen
2012-08-18 17:30 ` [PATCH 30/31] sections: Fix section conflicts in sound Andi Kleen
2012-08-18 17:30 ` [PATCH 31/31] Fix const sections for crc32 table Andi Kleen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345311022-26328-26-git-send-email-andi@firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=ak@linux.intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).