Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 16bd9b87 authored Oct 04, 2012 by Andi Kleen Committed by Linus Torvalds Oct 06, 2012

sections: fix section conflicts in drivers/scsi



Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3bd01896

drivers/scsi/aacraid/linit.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
	#elif defined(__devinitconst)		#elif defined(__devinitconst)
	static const struct pci_device_id aac_pci_tbl[] __devinitconst = {		static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
	#else		#else
	static const struct pci_device_id aac_pci_tbl[] __devinitdata = {		static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
	#endif		#endif
	{ 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */		{ 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
	{ 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */		{ 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */

drivers/scsi/aic94xx/aic94xx_init.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
	.lldd_ata_set_dmamode = asd_set_dmamode,		.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, 0x410),0, 0, 1},
	{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},		{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
	{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},		{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},