diff options
author | Len Brown <len.brown@intel.com> | 2007-03-20 11:05:41 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-03-20 11:05:41 -0400 |
commit | 54b8c39fbd76a7341b66e49de677ea366737fce7 (patch) | |
tree | 2a355e5daa966548034fe30f71fb9d9cc70403cf /include/acpi | |
parent | 0a14fe6e5efd0af0f9c6c01e0433445d615d0110 (diff) | |
parent | 0cd4554df0c261f7ba74786e471ccaa0e3725fb9 (diff) |
Pull misc-for-upstream into release branch
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/actypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 72a6e2c3a536..56bf492e7acc 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -344,7 +344,7 @@ typedef u32 acpi_integer; | |||
344 | 344 | ||
345 | /* 64-bit integers */ | 345 | /* 64-bit integers */ |
346 | 346 | ||
347 | typedef u64 acpi_integer; | 347 | typedef unsigned long long acpi_integer; |
348 | #define ACPI_INTEGER_MAX ACPI_UINT64_MAX | 348 | #define ACPI_INTEGER_MAX ACPI_UINT64_MAX |
349 | #define ACPI_INTEGER_BIT_SIZE 64 | 349 | #define ACPI_INTEGER_BIT_SIZE 64 |
350 | #define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */ | 350 | #define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */ |