Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (140 commits)
  ACPI: processor: use .notify method instead of installing handler directly
  ACPI: button: use .notify method instead of installing handler directly
  ACPI: support acpi_device_ops .notify methods
  toshiba-acpi: remove MAINTAINERS entry
  ACPI: battery: asynchronous init
  acer-wmi: Update copyright notice & documentation
  acer-wmi: Cleanup the failure cleanup handling
  acer-wmi: Blacklist Acer Aspire One
  video: build fix
  thinkpad-acpi: rework brightness support
  thinkpad-acpi: enhanced debugging messages for the fan subdriver
  thinkpad-acpi: enhanced debugging messages for the hotkey subdriver
  thinkpad-acpi: enhanced debugging messages for rfkill subdrivers
  thinkpad-acpi: restrict access to some firmware LEDs
  thinkpad-acpi: remove HKEY disable functionality
  thinkpad-acpi: add new debug helpers and warn of deprecated atts
  thinkpad-acpi: add missing log levels
  thinkpad-acpi: cleanup debug helpers
  thinkpad-acpi: documentation cleanup
  thinkpad-acpi: drop ibm-acpi alias
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index a0be9e39531e..a5ee23bc4f55 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -86,7 +86,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
          * Must delete or free any pointers within the object that are not
          * actual ACPI objects (for example, a raw buffer pointer).
          */
-        switch (ACPI_GET_OBJECT_TYPE(object)) {
+        switch (object->common.type) {
         case ACPI_TYPE_STRING:
 
                 ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
@@ -382,7 +382,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
                                           object, new_count));
                 }
 
-                if (ACPI_GET_OBJECT_TYPE(object) == ACPI_TYPE_METHOD) {
+                if (object->common.type == ACPI_TYPE_METHOD) {
                         ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
                                           "Method Obj %p Refs=%X, [Decremented]\n",
                                           object, new_count));
@@ -469,7 +469,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)
                  * All sub-objects must have their reference count incremented also.
                  * Different object types have different subobjects.
                  */
-                switch (ACPI_GET_OBJECT_TYPE(object)) {
+                switch (object->common.type) {
                 case ACPI_TYPE_DEVICE:
                 case ACPI_TYPE_PROCESSOR:
                 case ACPI_TYPE_POWER: