diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-03 17:58:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-03 17:58:02 +0100 |
| commit | 38a6fe8c013e72c402b37a7ea400387120f460d8 (patch) | |
| tree | 2b27c3bee7d8fe26d39084c95dca065b47444004 /drivers/serial/s3c2440.c | |
| parent | 320145fac91955ee35a6af7e1c2b42388a17b3d8 (diff) | |
| parent | 909db80297ba65699a77d877f7bf618ba960f6fc (diff) | |
| download | op-kernel-dev-38a6fe8c013e72c402b37a7ea400387120f460d8.zip op-kernel-dev-38a6fe8c013e72c402b37a7ea400387120f460d8.tar.gz | |
Merge branch 's3c-fixes-rc4-2' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'drivers/serial/s3c2440.c')
| -rw-r--r-- | drivers/serial/s3c2440.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c index 06c5b0c..69ff5d3 100644 --- a/drivers/serial/s3c2440.c +++ b/drivers/serial/s3c2440.c @@ -151,7 +151,7 @@ static int s3c2440_serial_probe(struct platform_device *dev) return s3c24xx_serial_probe(dev, &s3c2440_uart_inf); } -static struct platform_driver s3c2440_serial_drv = { +static struct platform_driver s3c2440_serial_driver = { .probe = s3c2440_serial_probe, .remove = __devexit_p(s3c24xx_serial_remove), .driver = { @@ -160,16 +160,16 @@ static struct platform_driver s3c2440_serial_drv = { }, }; -s3c24xx_console_init(&s3c2440_serial_drv, &s3c2440_uart_inf); +s3c24xx_console_init(&s3c2440_serial_driver, &s3c2440_uart_inf); static int __init s3c2440_serial_init(void) { - return s3c24xx_serial_init(&s3c2440_serial_drv, &s3c2440_uart_inf); + return s3c24xx_serial_init(&s3c2440_serial_driver, &s3c2440_uart_inf); } static void __exit s3c2440_serial_exit(void) { - platform_driver_unregister(&s3c2440_serial_drv); + platform_driver_unregister(&s3c2440_serial_driver); } module_init(s3c2440_serial_init); |
