diff options
| author | James Morris <jmorris@namei.org> | 2009-06-30 03:10:35 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-30 03:10:35 +0400 |
| commit | ac7242142b03421c96b0a2f8d99f146d075614c2 (patch) | |
| tree | b0b2ead65858c7a343d38affed86fe815e37e7e9 /drivers/serial/samsung.h | |
| parent | 89c86576ecde504da1eeb4f4882b2189ac2f9c4a (diff) | |
| parent | 2bfdd79eaa0043346e773ba5f6cfd811ea31b73d (diff) | |
| download | linux-ac7242142b03421c96b0a2f8d99f146d075614c2.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/serial/samsung.h')
| -rw-r--r-- | drivers/serial/samsung.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/samsung.h b/drivers/serial/samsung.h index 7afb94843a08..d3fe315969f6 100644 --- a/drivers/serial/samsung.h +++ b/drivers/serial/samsung.h @@ -72,7 +72,7 @@ struct s3c24xx_uart_port { extern int s3c24xx_serial_probe(struct platform_device *dev, struct s3c24xx_uart_info *uart); -extern int s3c24xx_serial_remove(struct platform_device *dev); +extern int __devexit s3c24xx_serial_remove(struct platform_device *dev); extern int s3c24xx_serial_initconsole(struct platform_driver *drv, struct s3c24xx_uart_info *uart); |