Merge branch 'msm-next-lumag' into HEAD

[platform/kernel/linux-rpi.git] / drivers / net / fjes / fjes_main.c

diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c
index 1eff202..2513be6 100644 (file)
--- a/drivers/net/fjes/fjes_main.c
+++ b/drivers/net/fjes/fjes_main.c
@@ -145,14 +145,12 @@ static int fjes_acpi_add(struct acpi_device *device)
        return 0;
 }
 
-static int fjes_acpi_remove(struct acpi_device *device)
+static void fjes_acpi_remove(struct acpi_device *device)
 {
        struct platform_device *plat_dev;
 
        plat_dev = (struct platform_device *)acpi_driver_data(device);
        platform_device_unregister(plat_dev);
-
-       return 0;
 }
 
 static struct acpi_driver fjes_acpi_driver = {