diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-08 09:58:55 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-08 09:58:55 +0100 |
commit | 552dc340bce3b28f4af33c9134adafa5efacf1c9 (patch) | |
tree | 8ec5d6d4f7462e92baa0732aa2c47cc33a0b851c /drivers/acpi/acpica/rsutils.c | |
parent | a9fda02bfc91a281cd812ae15dabe6bfb9574f90 (diff) | |
parent | ee621dd619b9a85eced150fc06e352fef54cfda0 (diff) |
Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'drivers/acpi/acpica/rsutils.c')
-rw-r--r-- | drivers/acpi/acpica/rsutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c index 22cfcfbd9fff..491191e6cf69 100644 --- a/drivers/acpi/acpica/rsutils.c +++ b/drivers/acpi/acpica/rsutils.c @@ -149,7 +149,7 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type) /* * 16-, 32-, and 64-bit cases must use the move macros that perform - * endian conversion and/or accomodate hardware that cannot perform + * endian conversion and/or accommodate hardware that cannot perform * misaligned memory transfers */ case ACPI_RSC_MOVE16: |