Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/kirkwood', 'asoc/topic...

[linux-2.6-block.git] / sound / soc / s6000 / s6000-i2s.c

diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c
index 7eba7979b9af606df34b2d40be1dceb8ef9a7964..1c8d01166e5bfdee80fd0209cb20f5357399f4f3 100644 (file)
--- a/sound/soc/s6000/s6000-i2s.c
+++ b/sound/soc/s6000/s6000-i2s.c
@@ -570,7 +570,7 @@ err_release_none:
        return ret;
 }
 
-static void s6000_i2s_remove(struct platform_device *pdev)
+static int s6000_i2s_remove(struct platform_device *pdev)
 {
        struct s6000_i2s_dev *dev = dev_get_drvdata(&pdev->dev);
        struct resource *region;
@@ -597,6 +597,8 @@ static void s6000_i2s_remove(struct platform_device *pdev)
        iounmap(mmio);
        region = platform_get_resource(pdev, IORESOURCE_IO, 0);
        release_mem_region(region->start, resource_size(region));
+
+       return 0;
 }
 
 static struct platform_driver s6000_i2s_driver = {