Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

[cascardo/linux.git] / drivers / serial / timbuart.c

diff --git a/drivers/serial/timbuart.c b/drivers/serial/timbuart.c
index 67ca642..1f36b7e 100644 (file)
--- a/drivers/serial/timbuart.c
+++ b/drivers/serial/timbuart.c
@@ -423,7 +423,7 @@ static struct uart_driver timbuart_driver = {
        .nr = 1
 };
 
-static int timbuart_probe(struct platform_device *dev)
+static int __devinit timbuart_probe(struct platform_device *dev)
 {
        int err, irq;
        struct timbuart_port *uart;
@@ -489,7 +489,7 @@ err_mem:
        return err;
 }
 
-static int timbuart_remove(struct platform_device *dev)
+static int __devexit timbuart_remove(struct platform_device *dev)
 {
        struct timbuart_port *uart = platform_get_drvdata(dev);
 
@@ -507,7 +507,7 @@ static struct platform_driver timbuart_platform_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = timbuart_probe,
-       .remove         = timbuart_remove,
+       .remove         = __devexit_p(timbuart_remove),
 };
 
 /*--------------------------------------------------------------------------*/