Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / drivers / acpi / namespace / nsxfeval.c

diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index b4e135eab7c7c49b16eed0cc1529d92d7f7943e7..38be5865d95df30e382f21b2adb8d2b6837aa2f9 100644 (file)
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -441,7 +441,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
        u32 flags;
        struct acpica_device_id hid;
        struct acpi_compatible_id_list *cid;
-       acpi_native_uint i;
+       u32 i;
        int found;
 
        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);