Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

[karo-tx-linux.git] / drivers / mfd / syscon.c

diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index 3dbfe9ab889c96290655eb6a3765858bc57bd0f8..3f10591ea94e9d2242bf8b79a6689703c93ed238 100644 (file)
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -138,7 +138,7 @@ static int syscon_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __devexit syscon_remove(struct platform_device *pdev)
+static int syscon_remove(struct platform_device *pdev)
 {
        struct syscon *syscon;