diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 08:24:02 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 08:24:02 -0500 |
| commit | bbba75606963c82febf7bd2761ea848ac5d1a1bb (patch) | |
| tree | 50880b4539c578c407f6c1aa605fddf5e371bb7e /drivers/serial | |
| parent | 073154459b80a43f7e4f088b11c93c8e9cb07f14 (diff) | |
| parent | ccbc87693dcb428443a72d644e63484676517c2d (diff) | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c index 7ac2bf5167cd..2335edafe903 100644 --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c | |||
| @@ -883,10 +883,10 @@ static struct uart_ops s3c24xx_serial_ops = { | |||
| 883 | 883 | ||
| 884 | static struct uart_driver s3c24xx_uart_drv = { | 884 | static struct uart_driver s3c24xx_uart_drv = { |
| 885 | .owner = THIS_MODULE, | 885 | .owner = THIS_MODULE, |
| 886 | .dev_name = "s3c2410_serial", | 886 | .driver_name = "s3c2410_serial", |
| 887 | .nr = CONFIG_SERIAL_SAMSUNG_UARTS, | 887 | .nr = CONFIG_SERIAL_SAMSUNG_UARTS, |
| 888 | .cons = S3C24XX_SERIAL_CONSOLE, | 888 | .cons = S3C24XX_SERIAL_CONSOLE, |
| 889 | .driver_name = S3C24XX_SERIAL_NAME, | 889 | .dev_name = S3C24XX_SERIAL_NAME, |
| 890 | .major = S3C24XX_SERIAL_MAJOR, | 890 | .major = S3C24XX_SERIAL_MAJOR, |
| 891 | .minor = S3C24XX_SERIAL_MINOR, | 891 | .minor = S3C24XX_SERIAL_MINOR, |
| 892 | }; | 892 | }; |