Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index 93b5d75db1263eff44696c1b33e0ff23755a9fd2..c8851a0db63ac3f004be857291701971f3141a1b 100644 (file)
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -1174,7 +1174,7 @@ int s3c24xx_serial_probe(struct platform_device *dev,
 
 EXPORT_SYMBOL_GPL(s3c24xx_serial_probe);
 
-int s3c24xx_serial_remove(struct platform_device *dev)
+int __devexit s3c24xx_serial_remove(struct platform_device *dev)
 {
        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);