Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

[karo-tx-linux.git] / drivers / xen / xen-acpi-pad.c

diff --git a/drivers/xen/xen-acpi-pad.c b/drivers/xen/xen-acpi-pad.c
index da39191e7278aa0aa26a242ca5c4542551e200c2..c763479ed85ebcfc47eaa76014d3bcc765a2f68e 100644 (file)
--- a/drivers/xen/xen-acpi-pad.c
+++ b/drivers/xen/xen-acpi-pad.c
@@ -140,8 +140,7 @@ static int acpi_pad_add(struct acpi_device *device)
        return 0;
 }
 
-static int acpi_pad_remove(struct acpi_device *device,
-       int type)
+static int acpi_pad_remove(struct acpi_device *device)
 {
        mutex_lock(&xen_cpu_lock);
        xen_acpi_pad_idle_cpus(0);