diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /drivers/ata/pata_acpi.c | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'drivers/ata/pata_acpi.c')
| -rw-r--r-- | drivers/ata/pata_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c index 294f3020a78..8e5e1321042 100644 --- a/drivers/ata/pata_acpi.c +++ b/drivers/ata/pata_acpi.c @@ -161,7 +161,7 @@ static void pacpi_set_dmamode(struct ata_port *ap, struct ata_device *adev) * * Called when the libata layer is about to issue a command. We wrap * this interface so that we can load the correct ATA timings if - * neccessary. + * necessary. */ static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc) |