diff options
| author | root <root@dyn-67.arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
| commit | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (patch) | |
| tree | 6b99638dc32b99420ada46ca8d1373ad7aa5a208 /drivers/serial/Kconfig | |
| parent | 7d83f8fca517b123cf0136503a9e50974f65ec49 (diff) | |
| parent | 5fa82eb8ff06cd3ac4d64c6875922ae1dfa003c5 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
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 7d7f576da202..9be11b0963f2 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -628,7 +628,7 @@ config SERIAL_MPSC_CONSOLE | |||
| 628 | 628 | ||
| 629 | config SERIAL_PXA | 629 | config SERIAL_PXA |
| 630 | bool "PXA serial port support" | 630 | bool "PXA serial port support" |
| 631 | depends on ARM && ARCH_PXA | 631 | depends on ARCH_PXA || ARCH_MMP |
| 632 | select SERIAL_CORE | 632 | select SERIAL_CORE |
| 633 | help | 633 | help |
| 634 | If you have a machine based on an Intel XScale PXA2xx CPU you | 634 | If you have a machine based on an Intel XScale PXA2xx CPU you |