diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:12:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:44 -0400 |
| commit | 16bd9b8782db45de1082c51967b4a348ceac1d42 (patch) | |
| tree | 733ede96662659f6521c2da101daaeed8ee30886 /drivers/scsi/aic94xx | |
| parent | 3bd018969c57e639ebfc30042d44433e30e03d35 (diff) | |
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>
Diffstat (limited to 'drivers/scsi/aic94xx')
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index ff80552ead84..1c4120c3db41 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 = { | |||
| 1012 | .lldd_ata_set_dmamode = asd_set_dmamode, | 1012 | .lldd_ata_set_dmamode = asd_set_dmamode, |
| 1013 | }; | 1013 | }; |
| 1014 | 1014 | ||
| 1015 | static const struct pci_device_id aic94xx_pci_table[] __devinitdata = { | 1015 | static const struct pci_device_id aic94xx_pci_table[] __devinitconst = { |
| 1016 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1}, | 1016 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1}, |
| 1017 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1}, | 1017 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1}, |
| 1018 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1}, | 1018 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1}, |