Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / acpi / acpica / evregion.c

diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 665c0887ab4de9af51e4414106539058e9bc909b..538d63264555b321d473ef95942f8602d9fe4a51 100644 (file)
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -691,7 +691,7 @@ acpi_ev_install_handler(acpi_handle obj_handle,
 
        /* Devices are handled different than regions */
 
-       if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_DEVICE) {
+       if (obj_desc->common.type == ACPI_TYPE_DEVICE) {
 
                /* Check if this Device already has a handler for this address space */
 
@@ -703,7 +703,8 @@ acpi_ev_install_handler(acpi_handle obj_handle,
                        if (next_handler_obj->address_space.space_id ==
                            handler_obj->address_space.space_id) {
                                ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
-                                                 "Found handler for region [%s] in device %p(%p) handler %p\n",
+                                                 "Found handler for region [%s] in device %p(%p) "
+                                                 "handler %p\n",
                                                  acpi_ut_get_region_name
                                                  (handler_obj->address_space.
                                                   space_id), obj_desc,