Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm

[pandora-kernel.git] / drivers / tty / serial / vt8500_serial.c

diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 026cb9e..2be006f 100644 (file)
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -544,7 +544,7 @@ static struct uart_driver vt8500_uart_driver = {
        .cons           = VT8500_CONSOLE,
 };
 
-static int __init vt8500_serial_probe(struct platform_device *pdev)
+static int __devinit vt8500_serial_probe(struct platform_device *pdev)
 {
        struct vt8500_port *vt8500_port;
        struct resource *mmres, *irqres;
@@ -605,7 +605,7 @@ static int __devexit vt8500_serial_remove(struct platform_device *pdev)
 
 static struct platform_driver vt8500_platform_driver = {
        .probe  = vt8500_serial_probe,
-       .remove = vt8500_serial_remove,
+       .remove = __devexit_p(vt8500_serial_remove),
        .driver = {
                .name = "vt8500_serial",
                .owner = THIS_MODULE,