diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:53:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:53:02 -0400 |
| commit | 132ea5e9aa9ce13f62ba45db8e43ec887d1106e9 (patch) | |
| tree | 417d93c83ccaa205efab507df56fc985242ba0ae /block | |
| parent | 0e26da0f2200a2fb51844aaa43e365ea9dd5a93d (diff) | |
| parent | cae5a29d3c4ec7c4214966021c9ee827e66bd67b (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
sata_mv: shorten register names
sata_mv: workaround errata SATA#13
sata_mv: cosmetic renames
sata_mv: workaround errata SATA#26
sata_mv: workaround errata PCI#7
sata_mv: replace 0x1f with ATA_PIO4 (v2)
sata_mv: fix irq mask races
sata_mv: revert SoC irq breakage
libata: ahci enclosure management bios workaround
ata: Add TRIM infrastructure
ata_piix: VGN-BX297XP wants the controller power up on suspend
libata: Remove some redundant casts from pata_octeon_cf.c
pata_artop: typo
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-settings.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index 59fd05d9f1d5..69c42adde52b 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
| @@ -431,7 +431,7 @@ EXPORT_SYMBOL(blk_queue_segment_boundary); | |||
| 431 | * | 431 | * |
| 432 | * description: | 432 | * description: |
| 433 | * set required memory and length alignment for direct dma transactions. | 433 | * set required memory and length alignment for direct dma transactions. |
| 434 | * this is used when buiding direct io requests for the queue. | 434 | * this is used when building direct io requests for the queue. |
| 435 | * | 435 | * |
| 436 | **/ | 436 | **/ |
| 437 | void blk_queue_dma_alignment(struct request_queue *q, int mask) | 437 | void blk_queue_dma_alignment(struct request_queue *q, int mask) |