summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-15 13:24:02 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-15 13:24:02 +0000
commitbbba75606963c82febf7bd2761ea848ac5d1a1bb (patch)
tree50880b4539c578c407f6c1aa605fddf5e371bb7e /drivers/serial
parent073154459b80a43f7e4f088b11c93c8e9cb07f14 (diff)
parentccbc87693dcb428443a72d644e63484676517c2d (diff)
downloadop-kernel-dev-bbba75606963c82febf7bd2761ea848ac5d1a1bb.zip
op-kernel-dev-bbba75606963c82febf7bd2761ea848ac5d1a1bb.tar.gz
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/samsung.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index 7ac2bf5..2335eda 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -883,10 +883,10 @@ static struct uart_ops s3c24xx_serial_ops = {
static struct uart_driver s3c24xx_uart_drv = {
.owner = THIS_MODULE,
- .dev_name = "s3c2410_serial",
+ .driver_name = "s3c2410_serial",
.nr = CONFIG_SERIAL_SAMSUNG_UARTS,
.cons = S3C24XX_SERIAL_CONSOLE,
- .driver_name = S3C24XX_SERIAL_NAME,
+ .dev_name = S3C24XX_SERIAL_NAME,
.major = S3C24XX_SERIAL_MAJOR,
.minor = S3C24XX_SERIAL_MINOR,
};
OpenPOWER on IntegriCloud