diff options
author | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
commit | cece901481bafbf14de8cbd3a89ae869ea881055 (patch) | |
tree | f9e240443643008c8feeaf55919105dc63ab8c72 /drivers/acpi/glue.c | |
parent | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (diff) | |
parent | 50dd096973f1d95aa03c6a6d9e148d706b62b68e (diff) | |
download | kernel_samsung_espresso10-cece901481bafbf14de8cbd3a89ae869ea881055.zip kernel_samsung_espresso10-cece901481bafbf14de8cbd3a89ae869ea881055.tar.gz kernel_samsung_espresso10-cece901481bafbf14de8cbd3a89ae869ea881055.tar.bz2 |
Pull style into test branch
Conflicts:
drivers/acpi/button.c
drivers/acpi/ec.c
drivers/acpi/osl.c
drivers/acpi/sbs.c
Diffstat (limited to 'drivers/acpi/glue.c')
-rw-r--r-- | drivers/acpi/glue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 4ac2f18..8a0324b 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -96,7 +96,7 @@ struct acpi_find_pci_root { static acpi_status do_root_bridge_busnr_callback(struct acpi_resource *resource, void *data) { - unsigned long *busnr = (unsigned long *)data; + unsigned long *busnr = data; struct acpi_resource_address64 address; if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 && @@ -221,7 +221,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv) acpi_status status; struct acpi_device_info *info; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; - struct acpi_find_child *find = (struct acpi_find_child *)context; + struct acpi_find_child *find = context; status = acpi_get_object_info(handle, &buffer); if (ACPI_SUCCESS(status)) { |