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

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: replace acpi_integer by u64
  ACPICA: Update version to 20100121.
  ACPICA: Remove unused uint32_struct type
  ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object
  ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type
  ACPICA: Predefined name repair: fix NULL package elements
  ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls
  ACPICA: Update all ACPICA copyrights and signons to 2010
  ACPICA: Update for new gcc-4 warning options

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 13cb80caacd..24b8faa5c39 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -374,6 +374,7 @@ union acpi_predefined_info {
 struct acpi_predefined_data {
         char *pathname;
         const union acpi_predefined_info *predefined;
+        union acpi_operand_object *parent_package;
         u32 flags;
         u8 node_flags;
 };
@@ -651,8 +652,7 @@ struct acpi_opcode_info {
 };
 
 union acpi_parse_value {
-        acpi_integer integer;   /* Integer constant (Up to 64 bits) */
-        struct uint64_struct integer64; /* Structure overlay for 2 32-bit Dwords */
+        u64 integer;            /* Integer constant (Up to 64 bits) */
         u32 size;               /* bytelist or field size */
         char *string;           /* NULL terminated string */
         u8 *buffer;             /* buffer or string */