Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2

[linux-2.6-omap-h63xx.git] / drivers / acpi / executer / exconvrt.c

diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index fd954b4ed83d7fc1cfdbaaa4a42c41e9fbc89473..261d97516d9b3cf69451f0559560b846b265a875 100644 (file)
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -288,11 +288,11 @@ acpi_ex_convert_to_ascii(acpi_integer integer,
                         u16 base, u8 * string, u8 data_width)
 {
        acpi_integer digit;
-       acpi_native_uint i;
-       acpi_native_uint j;
-       acpi_native_uint k = 0;
-       acpi_native_uint hex_length;
-       acpi_native_uint decimal_length;
+       u32 i;
+       u32 j;
+       u32 k = 0;
+       u32 hex_length;
+       u32 decimal_length;
        u32 remainder;
        u8 supress_zeros;
 
@@ -348,7 +348,7 @@ acpi_ex_convert_to_ascii(acpi_integer integer,
 
                /* hex_length: 2 ascii hex chars per data byte */
 
-               hex_length = (acpi_native_uint) ACPI_MUL_2(data_width);
+               hex_length = ACPI_MUL_2(data_width);
                for (i = 0, j = (hex_length - 1); i < hex_length; i++, j--) {
 
                        /* Get one hex digit, most significant digits first */