Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / drivers / serial / s3c2410.c

diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 87c182ef71b8662e4e6de1772cb2ada44b96b235..b5d7cbcba2ae23b6c171ccdbe5ef664d71f12b6f 100644 (file)
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -90,7 +90,7 @@ static int s3c2410_serial_probe(struct platform_device *dev)
 
 static struct platform_driver s3c2410_serial_drv = {
        .probe          = s3c2410_serial_probe,
-       .remove         = s3c24xx_serial_remove,
+       .remove         = __devexit_p(s3c24xx_serial_remove),
        .driver         = {
                .name   = "s3c2410-uart",
                .owner  = THIS_MODULE,