diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:20:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:20:40 -0500 |
| commit | cce0cac125623f9b68f25dd1350f6d616220a8dd (patch) | |
| tree | 123a4dd9f040d05e42cadb6b01f301d6863b897f /drivers/serial | |
| parent | f564c5fe29d3fa9adc6d839714521b0554c62598 (diff) | |
| parent | 18f49ea207fbcf37f81395037f0dc1cacb2aac3c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Manual conflict merge of arch/arm/Kconfig
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/s3c2410.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index 0a2dd6c5b95f..7410e093a6b9 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
| @@ -161,7 +161,11 @@ s3c24xx_serial_dbg(const char *fmt, ...) | |||
| 161 | 161 | ||
| 162 | /* we can support 3 uarts, but not always use them */ | 162 | /* we can support 3 uarts, but not always use them */ |
| 163 | 163 | ||
| 164 | #ifdef CONFIG_CPU_S3C2400 | ||
| 165 | #define NR_PORTS (2) | ||
| 166 | #else | ||
| 164 | #define NR_PORTS (3) | 167 | #define NR_PORTS (3) |
| 168 | #endif | ||
| 165 | 169 | ||
| 166 | /* port irq numbers */ | 170 | /* port irq numbers */ |
| 167 | 171 | ||