Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[linux-2.6] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 5a9754455eedf9c386a7b0c2782f271728f8acc8..09f6346d38a8127b6a05d58c4c2b9c3fc23d1b77 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -451,6 +451,7 @@ config SERIAL_CLPS711X_CONSOLE
 config SERIAL_SAMSUNG
        tristate "Samsung SoC serial support"
        depends on ARM && PLAT_S3C24XX
+       select SERIAL_CORE
        help
          Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
          providing /dev/ttySAC0, 1 and 2 (note, some machines may not
@@ -789,7 +790,7 @@ config BFIN_UART3_CTSRTS
 
 config SERIAL_IMX
        bool "IMX serial port support"
-       depends on ARM && ARCH_IMX
+       depends on ARM && (ARCH_IMX || ARCH_MXC)
        select SERIAL_CORE
        help
          If you have a machine based on a Motorola IMX CPU you