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

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

diff --git a/drivers/serial/s3c6400.c b/drivers/serial/s3c6400.c
index 3e37852336821721a842473ff866b3ff495ecf6f..48f1a3781f0de5f3af388665c4b3575d9fdadcc5 100644 (file)
--- a/drivers/serial/s3c6400.c
+++ b/drivers/serial/s3c6400.c
@@ -124,7 +124,7 @@ static int s3c6400_serial_probe(struct platform_device *dev)
 
 static struct platform_driver s3c6400_serial_drv = {
        .probe          = s3c6400_serial_probe,
-       .remove         = s3c24xx_serial_remove,
+       .remove         = __devexit_p(s3c24xx_serial_remove),
        .driver         = {
                .name   = "s3c6400-uart",
                .owner  = THIS_MODULE,