diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-25 19:32:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-25 19:32:02 -0700 |
| commit | 656ddf798dbe588217c97e58b9cfdfce649ebdc3 (patch) | |
| tree | e02659c481b7beb61b9f63c88e4cd200a4369517 /drivers/ata/ata_piix.c | |
| parent | 7e4720201ad44ace85a443f41d668a62a737e7d0 (diff) | |
| parent | 29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c (diff) | |
| download | linux-656ddf798dbe588217c97e58b9cfdfce649ebdc3.tar.bz2 | |
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:
[libata] Fix oops introduced in non-uniform port handling fix
[PATCH] ata-piix: fixes kerneldoc error
Diffstat (limited to 'drivers/ata/ata_piix.c')
| -rw-r--r-- | drivers/ata/ata_piix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index ab2ecccf7798..ffa111eea9da 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -851,7 +851,7 @@ static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev) * @ap: Port whose timings we are configuring * @adev: Drive in question * @udma: udma mode, 0 - 6 - * @is_ich: set if the chip is an ICH device + * @isich: set if the chip is an ICH device * * Set UDMA mode for device, in host controller PCI config space. * |