Merge branch 'autofs' (patches from Ian Kent)

[karo-tx-linux.git] / drivers / leds / leds-da9052.c

diff --git a/drivers/leds/leds-da9052.c b/drivers/leds/leds-da9052.c
index 58a5244c437e94661515243089299c7fd4b30747..efec43344e9f98b1ab56ae20f800d9fb5348ad56 100644 (file)
--- a/drivers/leds/leds-da9052.c
+++ b/drivers/leds/leds-da9052.c
@@ -102,7 +102,7 @@ static int da9052_configure_leds(struct da9052 *da9052)
        return error;
 }
 
-static int __devinit da9052_led_probe(struct platform_device *pdev)
+static int da9052_led_probe(struct platform_device *pdev)
 {
        struct da9052_pdata *pdata;
        struct da9052 *da9052;
@@ -176,7 +176,7 @@ err:
        return error;
 }
 
-static int __devexit da9052_led_remove(struct platform_device *pdev)
+static int da9052_led_remove(struct platform_device *pdev)
 {
        struct da9052_led *led = platform_get_drvdata(pdev);
        struct da9052_pdata *pdata;
@@ -204,7 +204,7 @@ static struct platform_driver da9052_led_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = da9052_led_probe,
-       .remove         = __devexit_p(da9052_led_remove),
+       .remove         = da9052_led_remove,
 };
 
 module_platform_driver(da9052_led_driver);