diff options
| author | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
| commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 (patch) | |
| tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 /drivers/serial/samsung.c | |
| parent | 1a8dd307cc0a2119be4e578c517795464e6dabba (diff) | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes. As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.
Conflicts:
arch/alpha/include/asm/percpu.h
arch/mn10300/kernel/vmlinux.lds.S
include/linux/percpu-defs.h
Diffstat (limited to 'drivers/serial/samsung.c')
| -rw-r--r-- | drivers/serial/samsung.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c index 93b5d75db126..c8851a0db63a 100644 --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c | |||
| @@ -1174,7 +1174,7 @@ int s3c24xx_serial_probe(struct platform_device *dev, | |||
| 1174 | 1174 | ||
| 1175 | EXPORT_SYMBOL_GPL(s3c24xx_serial_probe); | 1175 | EXPORT_SYMBOL_GPL(s3c24xx_serial_probe); |
| 1176 | 1176 | ||
| 1177 | int s3c24xx_serial_remove(struct platform_device *dev) | 1177 | int __devexit s3c24xx_serial_remove(struct platform_device *dev) |
| 1178 | { | 1178 | { |
| 1179 | struct uart_port *port = s3c24xx_dev_to_port(&dev->dev); | 1179 | struct uart_port *port = s3c24xx_dev_to_port(&dev->dev); |
| 1180 | 1180 | ||