diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 16:43:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:43:51 -0400 |
| commit | 37d7035da5b1f184c610b038b376c0c647d8d72b (patch) | |
| tree | c38d4058ad3232f985d9ed4501a8a842a2a47028 /arch/arm/mach-pxa/Kconfig | |
| parent | 0fc3ff31f1f0fa023bb61e9336a7aa3591f2dffe (diff) | |
| parent | 54b238469bce3a1b5012b2f0ebf261cf1c53e664 (diff) | |
Merge branch 'pxa-devel' into pxa
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index fdea1e7dc349..3e28521b9ebc 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -184,7 +184,7 @@ config MACH_COLIBRI | |||
| 184 | select PXA27x | 184 | select PXA27x |
| 185 | 185 | ||
| 186 | config MACH_ZYLONITE | 186 | config MACH_ZYLONITE |
| 187 | bool "PXA3xx Development Platform" | 187 | bool "PXA3xx Development Platform (aka Zylonite)" |
| 188 | select PXA3xx | 188 | select PXA3xx |
| 189 | select HAVE_PWM | 189 | select HAVE_PWM |
| 190 | 190 | ||