diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 00:25:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 00:25:40 -0400 |
| commit | c172cb73bc79fe69915b1a1a48e374aa4b1f8a59 (patch) | |
| tree | eb3d6415914968441c063f7282e824b14b5a5edb /drivers/acpi/acpica/nsrepair.c | |
| parent | e8eb6228094bcf0c84d9aa32b6363e78da68e1f5 (diff) | |
| parent | 28f4f8a9def2b1f3a6066bae791c77043ec49524 (diff) | |
Merge branch 'acpica-gpe' into release
Diffstat (limited to 'drivers/acpi/acpica/nsrepair.c')
| -rw-r--r-- | drivers/acpi/acpica/nsrepair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c index d4be37751be4..d1c136692667 100644 --- a/drivers/acpi/acpica/nsrepair.c +++ b/drivers/acpi/acpica/nsrepair.c | |||
| @@ -556,7 +556,7 @@ acpi_ns_repair_null_element(struct acpi_predefined_data *data, | |||
| 556 | 556 | ||
| 557 | /* Need an Integer - create a zero-value integer */ | 557 | /* Need an Integer - create a zero-value integer */ |
| 558 | 558 | ||
| 559 | new_object = acpi_ut_create_integer_object(0); | 559 | new_object = acpi_ut_create_integer_object((u64)0); |
| 560 | } else if (expected_btypes & ACPI_RTYPE_STRING) { | 560 | } else if (expected_btypes & ACPI_RTYPE_STRING) { |
| 561 | 561 | ||
| 562 | /* Need a String - create a NULL string */ | 562 | /* Need a String - create a NULL string */ |