Merge series "Report jack and button detection + Capture Support" from Lucas Tanure...

[linux-2.6-microblaze.git] / drivers / pcmcia / sa1111_generic.c

diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 1178341..29fdd17 100644 (file)
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -238,7 +238,7 @@ static int pcmcia_probe(struct sa1111_dev *dev)
        return ret;
 }
 
-static int pcmcia_remove(struct sa1111_dev *dev)
+static void pcmcia_remove(struct sa1111_dev *dev)
 {
        struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev);
 
@@ -252,7 +252,6 @@ static int pcmcia_remove(struct sa1111_dev *dev)
 
        release_mem_region(dev->res.start, 512);
        sa1111_disable_device(dev);
-       return 0;
 }
 
 static struct sa1111_driver pcmcia_driver = {