diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/arm/mach-ep93xx/Kconfig | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/arm/mach-ep93xx/Kconfig')
| -rw-r--r-- | arch/arm/mach-ep93xx/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig index ea8549bfbef2..5a1b8c05c958 100644 --- a/arch/arm/mach-ep93xx/Kconfig +++ b/arch/arm/mach-ep93xx/Kconfig | |||
| @@ -88,6 +88,20 @@ config MACH_TS72XX | |||
| 88 | Say 'Y' here if you want your kernel to support the | 88 | Say 'Y' here if you want your kernel to support the |
| 89 | Technologic Systems TS-72xx board. | 89 | Technologic Systems TS-72xx board. |
| 90 | 90 | ||
| 91 | choice | ||
| 92 | prompt "Select a UART for early kernel messages" | ||
| 93 | |||
| 94 | config EP93XX_EARLY_UART1 | ||
| 95 | bool "UART1" | ||
| 96 | |||
| 97 | config EP93XX_EARLY_UART2 | ||
| 98 | bool "UART2" | ||
| 99 | |||
| 100 | config EP93XX_EARLY_UART3 | ||
| 101 | bool "UART3" | ||
| 102 | |||
| 103 | endchoice | ||
| 104 | |||
| 91 | endmenu | 105 | endmenu |
| 92 | 106 | ||
| 93 | endif | 107 | endif |