Merge tag 'stable/for-linus-3.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / xen / xen-acpi-memhotplug.c

diff --git a/drivers/xen/xen-acpi-memhotplug.c b/drivers/xen/xen-acpi-memhotplug.c
index 678680cb213c7204a56fe013fc9fe4cb6888cecc..853b12dba5bb02556ec1e87768a67fde5e797112 100644 (file)
--- a/drivers/xen/xen-acpi-memhotplug.c
+++ b/drivers/xen/xen-acpi-memhotplug.c
@@ -188,7 +188,7 @@ acpi_memory_get_device(acpi_handle handle,
         * Now add the notified device.  This creates the acpi_device
         * and invokes .add function
         */
-       result = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE);
+       result = acpi_bus_scan(handle);
        if (result) {
                pr_warn(PREFIX "Cannot add acpi bus\n");
                return -EINVAL;
@@ -329,7 +329,7 @@ static int xen_acpi_memory_device_add(struct acpi_device *device)
        return result;
 }
 
-static int xen_acpi_memory_device_remove(struct acpi_device *device, int type)
+static int xen_acpi_memory_device_remove(struct acpi_device *device)
 {
        struct acpi_memory_device *mem_device = NULL;