Merge tag 'for-3.8-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[karo-tx-linux.git] / drivers / pwm / pwm-samsung.c

diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c
index 0704a2abd8c67496380456dee7e9d6467609cbc9..5207e6cd8648d0d89a7ecea039b930a6ff5cf6dc 100644 (file)
--- a/drivers/pwm/pwm-samsung.c
+++ b/drivers/pwm/pwm-samsung.c
@@ -274,7 +274,7 @@ static int s3c_pwm_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int __devexit s3c_pwm_remove(struct platform_device *pdev)
+static int s3c_pwm_remove(struct platform_device *pdev)
 {
        struct s3c_chip *s3c = platform_get_drvdata(pdev);
        int err;
@@ -328,7 +328,7 @@ static struct platform_driver s3c_pwm_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = s3c_pwm_probe,
-       .remove         = __devexit_p(s3c_pwm_remove),
+       .remove         = s3c_pwm_remove,
        .suspend        = s3c_pwm_suspend,
        .resume         = s3c_pwm_resume,
 };