diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-10-18 19:48:34 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-18 19:48:34 -0400 |
| commit | b7ae5056c94a8191c1fd0b5697707377516c0c5d (patch) | |
| tree | 394f68003ea0bc2a0c24e510a7c5b13f479ce743 /drivers/acpi/acpica/rsutils.c | |
| parent | 2126d0a4a205e2d6b763434f892524cd60f74228 (diff) | |
| parent | 6a2a11dbea5db417d200d38dda53c30a2e5603e0 (diff) | |
Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next
Conflicts:
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/radeon/r600_blit_kms.c
drivers/gpu/drm/ttm/ttm_bo.c
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 22cfcfbd9ff..491191e6cf6 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) | |||
| 149 | 149 | ||
| 150 | /* | 150 | /* |
| 151 | * 16-, 32-, and 64-bit cases must use the move macros that perform | 151 | * 16-, 32-, and 64-bit cases must use the move macros that perform |
| 152 | * endian conversion and/or accomodate hardware that cannot perform | 152 | * endian conversion and/or accommodate hardware that cannot perform |
| 153 | * misaligned memory transfers | 153 | * misaligned memory transfers |
| 154 | */ | 154 | */ |
| 155 | case ACPI_RSC_MOVE16: | 155 | case ACPI_RSC_MOVE16: |