diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:20:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:20:40 -0500 |
| commit | cce0cac125623f9b68f25dd1350f6d616220a8dd (patch) | |
| tree | 123a4dd9f040d05e42cadb6b01f301d6863b897f /arch/arm/mach-clps711x/Kconfig | |
| parent | f564c5fe29d3fa9adc6d839714521b0554c62598 (diff) | |
| parent | 18f49ea207fbcf37f81395037f0dc1cacb2aac3c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Manual conflict merge of arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-clps711x/Kconfig')
| -rw-r--r-- | arch/arm/mach-clps711x/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index 0793dcf54f2e..0e2b641268ad 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig | |||
| @@ -24,6 +24,8 @@ config ARCH_CEIVA | |||
| 24 | 24 | ||
| 25 | config ARCH_CLEP7312 | 25 | config ARCH_CLEP7312 |
| 26 | bool "CLEP7312" | 26 | bool "CLEP7312" |
| 27 | help | ||
| 28 | Boards based on the Cirrus Logic 7212/7312 chips. | ||
| 27 | 29 | ||
| 28 | config ARCH_EDB7211 | 30 | config ARCH_EDB7211 |
| 29 | bool "EDB7211" | 31 | bool "EDB7211" |