diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
| commit | f0006314d37639714da9658cf4ff3f1f9f420764 (patch) | |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 /drivers/serial/Kconfig | |
| parent | a177ba3b7a08beef3f0fe74efa0f90701891945a (diff) | |
| parent | 1bd55a436f1f90de0e7f476e514e01bd67497b88 (diff) | |
Merge branch 'imx' into devel
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'drivers/serial/Kconfig')
| -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 5a9754455eed..18ca9075e131 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -789,7 +789,7 @@ config BFIN_UART3_CTSRTS | |||
| 789 | 789 | ||
| 790 | config SERIAL_IMX | 790 | config SERIAL_IMX |
| 791 | bool "IMX serial port support" | 791 | bool "IMX serial port support" |
| 792 | depends on ARM && ARCH_IMX | 792 | depends on ARM && (ARCH_IMX || ARCH_MXC) |
| 793 | select SERIAL_CORE | 793 | select SERIAL_CORE |
| 794 | help | 794 | help |
| 795 | If you have a machine based on a Motorola IMX CPU you | 795 | If you have a machine based on a Motorola IMX CPU you |