diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 00:20:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 00:20:40 +0100 |
| commit | cce0cac125623f9b68f25dd1350f6d616220a8dd (patch) | |
| tree | 123a4dd9f040d05e42cadb6b01f301d6863b897f /drivers/serial | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | [ARM] 3278/1: OMAP: 3/3 Fix low-level io init for omap2 boards (diff) | |
| download | linux-cce0cac125623f9b68f25dd1350f6d616220a8dd.tar.xz linux-cce0cac125623f9b68f25dd1350f6d616220a8dd.zip | |
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, ...) /* we can support 3 uarts, but not always use them */ +#ifdef CONFIG_CPU_S3C2400 +#define NR_PORTS (2) +#else #define NR_PORTS (3) +#endif /* port irq numbers */ |