diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 17:25:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 17:25:00 -0500 |
commit | ce279e6ec91c49f2c5f59f7492e19d39edbf8bbd (patch) | |
tree | c2c4fb4266ec8dd07574f22ca6e0e0c943aabc1f /drivers/serial | |
parent | 894bcdfb1a40a7c5032242c380b956aab106e05d (diff) | |
parent | 97b5fe8e28d78779e35ac283bacb9eceffd5b4a3 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (23 commits)
[ARM] fix pxa930_trkball build errors
[ARM] fix netx
[ARM] fix pnx4008
[ARM] fix pxa
[ARM] remove missed CLPS7500 defconfig
[ARM] clps711x: fix warning in edb7211-mm.c
[ARM] clps711x: fix warning in fortunet
[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c
[ARM] Fix realview build
[ARM] 5357/1: Kirkwood: add missing ge01 tclk initialization
[ARM] 5358/1: AT2440EVB: Use new include path of mci.h
[ARM] 5361/1: mv78xx0: fix compilation error
[ARM] 5360/1: Orion: fix compilation error
[ARM] 5359/1: Kirkwood: fix compilation error
[ARM] S3C64XX: Fix EINT group macro definition
[ARM] Ensure CONFIG_SERIAL_SAMSUNG_UARTS is always set.
[ARM] S3C24XX: Add gpio_to_irq implementation
[ARM] S3C24XX: Add gpio_to_irq() facility
[ARM] footbridge: dc21285.c warning fixes
[ARM] footbridge: add isa_init_irq() to common header
...
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 64fcf8c2082..3e525e38a5d 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -457,7 +457,7 @@ config SERIAL_SAMSUNG | |||
457 | 457 | ||
458 | config SERIAL_SAMSUNG_UARTS | 458 | config SERIAL_SAMSUNG_UARTS |
459 | int | 459 | int |
460 | depends on SERIAL_SAMSUNG | 460 | depends on ARM && PLAT_S3C |
461 | default 2 if ARCH_S3C2400 | 461 | default 2 if ARCH_S3C2400 |
462 | default 4 if ARCH_S3C64XX || CPU_S3C2443 | 462 | default 4 if ARCH_S3C64XX || CPU_S3C2443 |
463 | default 3 | 463 | default 3 |