diff options
| author | Len Brown <len.brown@intel.com> | 2007-05-10 02:49:34 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-05-10 02:49:34 -0400 |
| commit | 71b43ca46fc5f0588ef64a14c6133c19a9b3f1ea (patch) | |
| tree | af25c06aa1af3ff2c210fe4b39abfdda55b84349 /drivers/acpi/namespace/nsxfeval.c | |
| parent | 3dd6786f55219f87fd33e153669600d715ca9270 (diff) | |
| parent | fd3509436fde38d4c854bf5a6b83d2c779904f8e (diff) | |
Pull acpica into release branch
Diffstat (limited to 'drivers/acpi/namespace/nsxfeval.c')
| -rw-r--r-- | drivers/acpi/namespace/nsxfeval.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c index 7ac6ace50059..be4f2899de74 100644 --- a/drivers/acpi/namespace/nsxfeval.c +++ b/drivers/acpi/namespace/nsxfeval.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | 48 | ||
| 49 | #define _COMPONENT ACPI_NAMESPACE | 49 | #define _COMPONENT ACPI_NAMESPACE |
| 50 | ACPI_MODULE_NAME("nsxfeval") | 50 | ACPI_MODULE_NAME("nsxfeval") |
| 51 | |||
| 52 | #ifdef ACPI_FUTURE_USAGE | 51 | #ifdef ACPI_FUTURE_USAGE |
| 53 | /******************************************************************************* | 52 | /******************************************************************************* |
| 54 | * | 53 | * |
| @@ -73,8 +72,8 @@ ACPI_MODULE_NAME("nsxfeval") | |||
| 73 | acpi_status | 72 | acpi_status |
| 74 | acpi_evaluate_object_typed(acpi_handle handle, | 73 | acpi_evaluate_object_typed(acpi_handle handle, |
| 75 | acpi_string pathname, | 74 | acpi_string pathname, |
| 76 | struct acpi_object_list * external_params, | 75 | struct acpi_object_list *external_params, |
| 77 | struct acpi_buffer * return_buffer, | 76 | struct acpi_buffer *return_buffer, |
| 78 | acpi_object_type return_type) | 77 | acpi_object_type return_type) |
| 79 | { | 78 | { |
| 80 | acpi_status status; | 79 | acpi_status status; |
| @@ -143,7 +142,6 @@ acpi_evaluate_object_typed(acpi_handle handle, | |||
| 143 | 142 | ||
| 144 | ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed) | 143 | ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed) |
| 145 | #endif /* ACPI_FUTURE_USAGE */ | 144 | #endif /* ACPI_FUTURE_USAGE */ |
| 146 | |||
| 147 | /******************************************************************************* | 145 | /******************************************************************************* |
| 148 | * | 146 | * |
| 149 | * FUNCTION: acpi_evaluate_object | 147 | * FUNCTION: acpi_evaluate_object |
