diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-06 15:30:03 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-06 15:30:03 -0500 |
| commit | 76a2e849df47697706024262a8bbb83432b8bde7 (patch) | |
| tree | cc3d5d6077739435e0b110510e271e243bd3e2ed /drivers/acpi | |
| parent | 894d79bedd8b48fe838083f2d2a42ac09817c530 (diff) | |
| parent | 03c6d130f690dba46387480de80acf458a6fd14c (diff) | |
Pull acpica into test branch
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/tables/tbutils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c index 4a2f99e2fc44..1da64b4518c0 100644 --- a/drivers/acpi/tables/tbutils.c +++ b/drivers/acpi/tables/tbutils.c | |||
| @@ -97,15 +97,15 @@ acpi_tb_print_table_header(acpi_physical_address address, | |||
| 97 | 97 | ||
| 98 | /* FACS only has signature and length fields of common table header */ | 98 | /* FACS only has signature and length fields of common table header */ |
| 99 | 99 | ||
| 100 | ACPI_INFO((AE_INFO, "%4.4s @ 0x%p/0x%04X", | 100 | ACPI_INFO((AE_INFO, "%4.4s %08lX, %04X", |
| 101 | header->signature, ACPI_CAST_PTR(void, address), | 101 | header->signature, (unsigned long)address, |
| 102 | header->length)); | 102 | header->length)); |
| 103 | } else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) { | 103 | } else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) { |
| 104 | 104 | ||
| 105 | /* RSDP has no common fields */ | 105 | /* RSDP has no common fields */ |
| 106 | 106 | ||
| 107 | ACPI_INFO((AE_INFO, "RSDP @ 0x%p/0x%04X (v%3.3d %6.6s)", | 107 | ACPI_INFO((AE_INFO, "RSDP %08lX, %04X (r%d %6.6s)", |
| 108 | ACPI_CAST_PTR(void, address), | 108 | (unsigned long)address, |
| 109 | (ACPI_CAST_PTR(struct acpi_table_rsdp, header)-> | 109 | (ACPI_CAST_PTR(struct acpi_table_rsdp, header)-> |
| 110 | revision > | 110 | revision > |
| 111 | 0) ? ACPI_CAST_PTR(struct acpi_table_rsdp, | 111 | 0) ? ACPI_CAST_PTR(struct acpi_table_rsdp, |
| @@ -118,8 +118,8 @@ acpi_tb_print_table_header(acpi_physical_address address, | |||
| 118 | /* Standard ACPI table with full common header */ | 118 | /* Standard ACPI table with full common header */ |
| 119 | 119 | ||
| 120 | ACPI_INFO((AE_INFO, | 120 | ACPI_INFO((AE_INFO, |
| 121 | "%4.4s @ 0x%p/0x%04X (v%3.3d %6.6s %8.8s 0x%08X %4.4s 0x%08X)", | 121 | "%4.4s %08lX, %04X (r%d %6.6s %8.8s %8X %4.4s %8X)", |
| 122 | header->signature, ACPI_CAST_PTR(void, address), | 122 | header->signature, (unsigned long)address, |
| 123 | header->length, header->revision, header->oem_id, | 123 | header->length, header->revision, header->oem_id, |
| 124 | header->oem_table_id, header->oem_revision, | 124 | header->oem_table_id, header->oem_revision, |
| 125 | header->asl_compiler_id, | 125 | header->asl_compiler_id, |