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

[android-sdk/kernel-video.git] / drivers / pwm / pwm-lpc32xx.c

diff --git a/drivers/pwm/pwm-lpc32xx.c b/drivers/pwm/pwm-lpc32xx.c
index 81db1bd5e92d0380dba9145c99cf0ebb42839651..14106440294fa94fd468563f4bed1212d6f356fe 100644 (file)
--- a/drivers/pwm/pwm-lpc32xx.c
+++ b/drivers/pwm/pwm-lpc32xx.c
@@ -134,7 +134,7 @@ static int lpc32xx_pwm_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __devexit lpc32xx_pwm_remove(struct platform_device *pdev)
+static int lpc32xx_pwm_remove(struct platform_device *pdev)
 {
        struct lpc32xx_pwm_chip *lpc32xx = platform_get_drvdata(pdev);
        unsigned int i;
@@ -157,7 +157,7 @@ static struct platform_driver lpc32xx_pwm_driver = {
                .of_match_table = of_match_ptr(lpc32xx_pwm_dt_ids),
        },
        .probe = lpc32xx_pwm_probe,
-       .remove = __devexit_p(lpc32xx_pwm_remove),
+       .remove = lpc32xx_pwm_remove,
 };
 module_platform_driver(lpc32xx_pwm_driver);