diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
| commit | 393d81aa026e19b6ede6f5f11955c97ee62e5df5 (patch) | |
| tree | a1d9511e488e19d41089ff0a736f6ce52a81c6e5 /drivers/acpi/resources/rsmisc.c | |
| parent | 93a0886e2368eafb9df5e2021fb185195cee88b2 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'drivers/acpi/resources/rsmisc.c')
| -rw-r--r-- | drivers/acpi/resources/rsmisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c index de1ac3881b22..96a6c0353255 100644 --- a/drivers/acpi/resources/rsmisc.c +++ b/drivers/acpi/resources/rsmisc.c | |||
| @@ -82,7 +82,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource, | |||
| 82 | 82 | ||
| 83 | ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource); | 83 | ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource); |
| 84 | 84 | ||
| 85 | if (((acpi_native_uint) resource) & 0x3) { | 85 | if (((acpi_size) resource) & 0x3) { |
| 86 | 86 | ||
| 87 | /* Each internal resource struct is expected to be 32-bit aligned */ | 87 | /* Each internal resource struct is expected to be 32-bit aligned */ |
| 88 | 88 | ||