diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 18:52:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 18:52:45 -0700 |
commit | 0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230 (patch) | |
tree | 50839e8c1d52c7c5fcd93fab6ad5a81b59135cff /drivers/ata/libata-core.c | |
parent | 44ce6294d07555c3d313757105fd44b78208407f (diff) | |
parent | e0863397cb8f3ede356ef2cb7dcdccc9956cdc6d (diff) | |
download | blackbird-op-linux-0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230.tar.gz blackbird-op-linux-0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230.zip |
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:
Doc Fix: remove mention of combined mode-related kernel parameters
libata: fix kernel-doc parameters
Fix pata_qdi.c probe code
pata_scc: fix compilation
sata_via: add missing PM hooks
sata_nv: fix ADMA freeze/thaw/irq_clear issues
pata_pcmcia.c: add card ident for jvc cdrom
sata_promise: SATAII-150/300 TX4 port numbering fix
sata_promise: fix another error decode regression
libata-acpi: fix _GTF command protocol for ATAPI devices
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r-- | drivers/ata/libata-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index fef87dd70d17..4595d1f8cf60 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -895,6 +895,7 @@ static u64 ata_read_native_max_address(struct ata_device *dev) /** * ata_set_native_max_address_ext - LBA48 native max set * @dev: Device to query + * @new_sectors: new max sectors value to set for the device * * Perform an LBA48 size set max upon the device in question. Return the * actual LBA48 size or zero if the command fails. @@ -932,6 +933,7 @@ static u64 ata_set_native_max_address_ext(struct ata_device *dev, u64 new_sector /** * ata_set_native_max_address - LBA28 native max set * @dev: Device to query + * @new_sectors: new max sectors value to set for the device * * Perform an LBA28 size set max upon the device in question. Return the * actual LBA28 size or zero if the command fails. |