Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / drivers / acpi / glue.c

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 4c8fcff..4af6301 100644 (file)
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -9,6 +9,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 #include <linux/rwsem.h>
 #include <linux/acpi.h>
 
@@ -87,7 +88,7 @@ static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle)
 /* Get device's handler per its address under its parent */
 struct acpi_find_child {
        acpi_handle handle;
-       acpi_integer address;
+       u64 address;
 };
 
 static acpi_status
@@ -106,7 +107,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
        return AE_OK;
 }
 
-acpi_handle acpi_get_child(acpi_handle parent, acpi_integer address)
+acpi_handle acpi_get_child(acpi_handle parent, u64 address)
 {
        struct acpi_find_child find = { NULL, address };