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: (22 commits)
  ACPI: fix early DSDT dmi check warnings on ia64
  ACPICA: Update version to 20100428.
  ACPICA: Update/clarify some parameter names associated with acpi_handle
  ACPICA: Rename acpi_ex_system_do_suspend->acpi_ex_system_do_sleep
  ACPICA: Prevent possible allocation overrun during object copy
  ACPICA: Split large file, evgpeblk
  ACPICA: Add GPE support for dynamically loaded ACPI tables
  ACPICA: Clarify/rename some root table descriptor fields
  ACPICA: Update version to 20100331.
  ACPICA: Minimize the differences between linux GPE code and ACPICA code base
  ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT
  ACPICA: Update DSDT copy/detection.
  ACPICA: Add subsystem option to force copy of DSDT to local memory
  ACPICA: Add detection of corrupted/replaced DSDT
  ACPICA: Add write support for DataTable operation regions
  ACPICA: Fix for acpi_reallocate_root_table for incorrect root table copy
  ACPICA: Update comments/headers, no functional change
  ACPICA: Update version to 20100304
  ACPICA: Fix for possible fault in acpi_ex_release_mutex
  ACPICA: Standardize integer output for ACPICA warnings/errors
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index f2ee3b548609..c80a2eea3a01 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -212,7 +212,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
 
                 if ((*top_object_list)->common.type != ACPI_TYPE_PACKAGE) {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X]) Need sub-package, found %s",
+                                    "(PRT[%u]) Need sub-package, found %s",
                                     index,
                                     acpi_ut_get_object_type_name
                                     (*top_object_list)));
@@ -223,7 +223,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
 
                 if ((*top_object_list)->package.count != 4) {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X]) Need package of length 4, found length %d",
+                                    "(PRT[%u]) Need package of length 4, found length %u",
                                     index, (*top_object_list)->package.count));
                         return_ACPI_STATUS(AE_AML_PACKAGE_LIMIT);
                 }
@@ -240,7 +240,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 obj_desc = sub_object_list[0];
                 if (obj_desc->common.type != ACPI_TYPE_INTEGER) {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X].Address) Need Integer, found %s",
+                                    "(PRT[%u].Address) Need Integer, found %s",
                                     index,
                                     acpi_ut_get_object_type_name(obj_desc)));
                         return_ACPI_STATUS(AE_BAD_DATA);
@@ -253,7 +253,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 obj_desc = sub_object_list[1];
                 if (obj_desc->common.type != ACPI_TYPE_INTEGER) {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X].Pin) Need Integer, found %s",
+                                    "(PRT[%u].Pin) Need Integer, found %s",
                                     index,
                                     acpi_ut_get_object_type_name(obj_desc)));
                         return_ACPI_STATUS(AE_BAD_DATA);
@@ -289,7 +289,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                                 if (obj_desc->reference.class !=
                                     ACPI_REFCLASS_NAME) {
                                         ACPI_ERROR((AE_INFO,
-                                                    "(PRT[%X].Source) Need name, found Reference Class %X",
+                                                    "(PRT[%u].Source) Need name, found Reference Class 0x%X",
                                                     index,
                                                     obj_desc->reference.class));
                                         return_ACPI_STATUS(AE_BAD_DATA);
@@ -340,7 +340,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                         default:
 
                                 ACPI_ERROR((AE_INFO,
-                                            "(PRT[%X].Source) Need Ref/String/Integer, found %s",
+                                            "(PRT[%u].Source) Need Ref/String/Integer, found %s",
                                             index,
                                             acpi_ut_get_object_type_name
                                             (obj_desc)));
@@ -358,7 +358,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 obj_desc = sub_object_list[3];
                 if (obj_desc->common.type != ACPI_TYPE_INTEGER) {
                         ACPI_ERROR((AE_INFO,
-                                    "(PRT[%X].SourceIndex) Need Integer, found %s",
+                                    "(PRT[%u].SourceIndex) Need Integer, found %s",
                                     index,
                                     acpi_ut_get_object_type_name(obj_desc)));
                         return_ACPI_STATUS(AE_BAD_DATA);