Merge branch 'next' into for-linus

[sfrench/cifs-2.6.git] / drivers / input / serio / sa1111ps2.c

diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 7b8ceb702a74b1c9cbd9743c5feb7eb5a3858c3d..68fac4801e2e25a031a75e934286214e39fa7771 100644 (file)
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -344,7 +344,7 @@ static int ps2_probe(struct sa1111_dev *dev)
 /*
  * Remove one device from this driver.
  */
-static int ps2_remove(struct sa1111_dev *dev)
+static void ps2_remove(struct sa1111_dev *dev)
 {
        struct ps2if *ps2if = sa1111_get_drvdata(dev);
 
@@ -353,8 +353,6 @@ static int ps2_remove(struct sa1111_dev *dev)
        sa1111_set_drvdata(dev, NULL);
 
        kfree(ps2if);
-
-       return 0;
 }
 
 /*