diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 19:27:56 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 19:27:56 (GMT) |
| commit | 468f8afdf4f87378c7c7de1d636a9375fce4078d (patch) | |
| tree | bd2eb44629e9d3696cd6c3643fbdf1dc7392b7a8 /drivers/ata/libata-scsi.c | |
| parent | ebab89909e0dc716282d5e7f6e73a3155fe66d4a (diff) | |
| parent | 5270222f96608818e431b5c4029b1f12020ab719 (diff) | |
| download | linux-468f8afdf4f87378c7c7de1d636a9375fce4078d.tar.xz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (23 commits)
libata: don't configure downstream links faster than the upstream link
libata: request PHY speed configuration on SControl access failure
libata: consider errors not associated with commands for speed down
libata: more robust reset failure handling
libata: cosmetic clean up / reorganization of ata_eh_reset()
libata: fix timing computation in ata_eh_reset()
libata: increase 128 KB / cmd limit for ATAPI tape drives
sata_promise: fix endianess bug in ASIC PRD bug workaround
libata: fix docbook
make ata_scsi_lpm_get() static
libata: suppress two warnings
ata/sata_fsl: Remove ata_scsi_suspend/resume callbacks
ata/sata_fsl: Remove sending LOG EXT command in sata_fsl_softreset()
ata/sata_fsl: Move MPC8315DS link speed limit workaround to specific ifdef
ata/sata_fsl: cleanup style problem
ata/sata_fsl: remove unneeded sata_fsl_hardreset()
ata/sata_fsl: remove unneeded on-stack copy of FIS
ata/sata_fsl: cleanup needless casts to/from void __iomem *
ata/sata_fsl: Remove unnecessary SCR cases
ata/sata_fsl: Kill ata_sg_is_last()
...
Diffstat (limited to 'drivers/ata/libata-scsi.c')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index fc89590..245057d 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -120,7 +120,7 @@ static const struct { { MEDIUM_POWER, "medium_power" }, }; -const char *ata_scsi_lpm_get(enum link_pm policy) +static const char *ata_scsi_lpm_get(enum link_pm policy) { int i; |