diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 15:19:14 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 15:19:14 -0400 |
| commit | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch) | |
| tree | 313b3b9ca04727f3704464e01d8dd97da1dd534b /drivers/serial/Kconfig | |
| parent | 19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
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 047c20d35a98..09f6346d38a8 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -790,7 +790,7 @@ config BFIN_UART3_CTSRTS | |||
| 790 | 790 | ||
| 791 | config SERIAL_IMX | 791 | config SERIAL_IMX |
| 792 | bool "IMX serial port support" | 792 | bool "IMX serial port support" |
| 793 | depends on ARM && ARCH_IMX | 793 | depends on ARM && (ARCH_IMX || ARCH_MXC) |
| 794 | select SERIAL_CORE | 794 | select SERIAL_CORE |
| 795 | help | 795 | help |
| 796 | If you have a machine based on a Motorola IMX CPU you | 796 | If you have a machine based on a Motorola IMX CPU you |