diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 13:00:02 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 13:00:02 +0900 |
| commit | 4b6b987969b076298485697bfb0d0e35502642a3 (patch) | |
| tree | a8f5ebd6a0b9efbe30272012d759669b0c5ddc13 /drivers/serial/s3c2410.c | |
| parent | df47cd096c8f54a5242e3a2ffb4525c804567eda (diff) | |
| parent | 60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d (diff) | |
| download | kernel-crypto-4b6b987969b076298485697bfb0d0e35502642a3.tar.gz kernel-crypto-4b6b987969b076298485697bfb0d0e35502642a3.tar.xz kernel-crypto-4b6b987969b076298485697bfb0d0e35502642a3.zip | |
Merge branch 'master' into sh/hwblk
Diffstat (limited to 'drivers/serial/s3c2410.c')
| -rw-r--r-- | drivers/serial/s3c2410.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index b5d7cbcba2a..c99f0821cae 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c @@ -88,7 +88,7 @@ static int s3c2410_serial_probe(struct platform_device *dev) return s3c24xx_serial_probe(dev, &s3c2410_uart_inf); } -static struct platform_driver s3c2410_serial_drv = { +static struct platform_driver s3c2410_serial_driver = { .probe = s3c2410_serial_probe, .remove = __devexit_p(s3c24xx_serial_remove), .driver = { @@ -97,16 +97,16 @@ static struct platform_driver s3c2410_serial_drv = { }, }; -s3c24xx_console_init(&s3c2410_serial_drv, &s3c2410_uart_inf); +s3c24xx_console_init(&s3c2410_serial_driver, &s3c2410_uart_inf); static int __init s3c2410_serial_init(void) { - return s3c24xx_serial_init(&s3c2410_serial_drv, &s3c2410_uart_inf); + return s3c24xx_serial_init(&s3c2410_serial_driver, &s3c2410_uart_inf); } static void __exit s3c2410_serial_exit(void) { - platform_driver_unregister(&s3c2410_serial_drv); + platform_driver_unregister(&s3c2410_serial_driver); } module_init(s3c2410_serial_init); |