diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-18 16:15:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-18 16:15:16 -0700 |
| commit | 77e2782f9b683893c9341e9cf05c88b0caac7382 (patch) | |
| tree | de65fd4477b104c64b55c144529fa6185fc70853 /drivers | |
| parent | 803db244b9f71102e366fd689000c1417b9a7508 (diff) | |
| parent | e40b1074af46d53740320f88dfffd9fb2f78bdf3 (diff) | |
| download | lwn-77e2782f9b683893c9341e9cf05c88b0caac7382.tar.gz lwn-77e2782f9b683893c9341e9cf05c88b0caac7382.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3815/1: headers_install support for ARM
[ARM] 3794/1: S3C24XX: do not defined set_irq_wake when no CONFIG_PM
[ARM] 3793/1: S3C2412: fix wrong serial info struct
[ARM] 3780/1: Fix iop321 cpuid
[ARM] 3786/1: pnx4008: update defconfig
[ARM] 3785/1: S3C2412: Fix idle code as default uses wrong clocks
[ARM] 3784/1: S3C2413: fix config for MACH_S3C2413/MACH_SMDK2413
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/s3c2410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index 392bffcf96e8..95738a19cde7 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c @@ -1621,7 +1621,7 @@ static struct s3c24xx_uart_info s3c2412_uart_inf = { static int s3c2412_serial_probe(struct platform_device *dev) { dbg("s3c2440_serial_probe: dev=%p\n", dev); - return s3c24xx_serial_probe(dev, &s3c2440_uart_inf); + return s3c24xx_serial_probe(dev, &s3c2412_uart_inf); } static struct platform_driver s3c2412_serial_drv = { |