Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / video / backlight / l4f00242t03.c

diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c
index 2d90c0648aa056f09992b23d4f70dde5b536137f..f5aa0a5961d63e8f8e9cc3c355815970ce7c6584 100644 (file)
--- a/drivers/video/backlight/l4f00242t03.c
+++ b/drivers/video/backlight/l4f00242t03.c
@@ -150,7 +150,7 @@ static struct lcd_ops l4f_ops = {
        .get_power      = l4f00242t03_lcd_power_get,
 };
 
-static int __devinit l4f00242t03_probe(struct spi_device *spi)
+static int l4f00242t03_probe(struct spi_device *spi)
 {
        struct l4f00242t03_priv *priv;
        struct l4f00242t03_pdata *pdata = spi->dev.platform_data;
@@ -230,7 +230,7 @@ err1:
        return ret;
 }
 
-static int __devexit l4f00242t03_remove(struct spi_device *spi)
+static int l4f00242t03_remove(struct spi_device *spi)
 {
        struct l4f00242t03_priv *priv = dev_get_drvdata(&spi->dev);
 
@@ -260,7 +260,7 @@ static struct spi_driver l4f00242t03_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = l4f00242t03_probe,
-       .remove         = __devexit_p(l4f00242t03_remove),
+       .remove         = l4f00242t03_remove,
        .shutdown       = l4f00242t03_shutdown,
 };