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

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

diff --git a/drivers/serial/s3c2412.c b/drivers/serial/s3c2412.c
index fd017b37556868ca2268d28101770e028d6538b0..11dcb90bdfefaa8fa5f6d391f01c8ba0298465e7 100644 (file)
--- a/drivers/serial/s3c2412.c
+++ b/drivers/serial/s3c2412.c
@@ -123,7 +123,7 @@ static int s3c2412_serial_probe(struct platform_device *dev)
 
 static struct platform_driver s3c2412_serial_drv = {
        .probe          = s3c2412_serial_probe,
-       .remove         = s3c24xx_serial_remove,
+       .remove         = __devexit_p(s3c24xx_serial_remove),
        .driver         = {
                .name   = "s3c2412-uart",
                .owner  = THIS_MODULE,