When a merge does not work automatically, git prevents

[linux-2.6] / include / acpi / acnamesp.h

diff --git a/include/acpi/acnamesp.h b/include/acpi/acnamesp.h
index 870e2544bd9b61cc8f31a6ad81fd35b698d4e0fd..0c9ba707925bbf107bd6582a8a4be8436d90e14e 100644 (file)
--- a/include/acpi/acnamesp.h
+++ b/include/acpi/acnamesp.h
@@ -124,7 +124,7 @@ acpi_ns_parse_table (
 
 acpi_status
 acpi_ns_one_complete_parse (
-       u32                             pass_number,
+       u8                              pass_number,
        struct acpi_table_desc          *table_desc);