diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-04-03 09:04:31 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-04-07 12:19:10 -0500 |
| commit | 79bc14813cd7e1b75d2e4cbbc17043261cf4bcdc (patch) | |
| tree | 6b090baa08ac80861b86fa2f41c89058211ce06a /include | |
| parent | 2f3edc6936e3f6be3f1df1e89c141ae028fa605e (diff) | |
| download | linux-79bc14813cd7e1b75d2e4cbbc17043261cf4bcdc.tar.gz linux-79bc14813cd7e1b75d2e4cbbc17043261cf4bcdc.tar.bz2 linux-79bc14813cd7e1b75d2e4cbbc17043261cf4bcdc.zip | |
[SCSI] libsas: fix missing inlines in header file
Two functions in include/scsi/sas_ata.h don't have static inlines
leading to problems if they're built in:
On Thu, 2008-04-03 at 14:06 +0200, Toralf Förster wrote:
> drivers/scsi/mvsas.o: In function `sas_ata_init_host_and_port':
> mvsas.c:(.text+0x0): multiple definition of `sas_ata_init_host_and_port'
> drivers/scsi/libsas/built-in.o:(.text+0x37f4): first defined here
> drivers/scsi/mvsas.o: In function `sas_ata_task_abort':
> mvsas.c:(.text+0x7): multiple definition of `sas_ata_task_abort'
> drivers/scsi/libsas/built-in.o:(.text+0x37fb): first defined here
> make[2]: *** [drivers/scsi/built-in.o] Error 1
> make[1]: *** [drivers/scsi] Error 2
> make: *** [drivers] Error 2
Add the correct static inline modifiers.
Tested-by: Toralf Förster <toralf.foerster@gmx.de>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/sas_ata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h index dd5edc915417..c583193ae929 100644 --- a/include/scsi/sas_ata.h +++ b/include/scsi/sas_ata.h @@ -47,12 +47,12 @@ static inline int dev_is_sata(struct domain_device *dev) { return 0; } -int sas_ata_init_host_and_port(struct domain_device *found_dev, +static inline int sas_ata_init_host_and_port(struct domain_device *found_dev, struct scsi_target *starget) { return 0; } -void sas_ata_task_abort(struct sas_task *task) +static inline void sas_ata_task_abort(struct sas_task *task) { } #endif |