diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
| commit | 1543966a079fc7065849ae43ca4dd767c188ad55 (patch) | |
| tree | 760ddb82836a4e3edf314227c731d5dc181d11a7 /arch/arm/mach-pxa/Kconfig | |
| parent | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff) | |
| parent | 4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff) | |
Merge branch 'pxa-palm' into pxa-machines
Conflicts:
drivers/mfd/Kconfig
drivers/pcmcia/Makefile
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index d056e0ff781..5548abd6390 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -288,6 +288,16 @@ config MACH_PALMTX | |||
| 288 | Say Y here if you intend to run this kernel on a Palm T|X | 288 | Say Y here if you intend to run this kernel on a Palm T|X |
| 289 | handheld computer. | 289 | handheld computer. |
| 290 | 290 | ||
| 291 | config MACH_PALMZ72 | ||
| 292 | bool "Palm Zire 72" | ||
| 293 | default y | ||
| 294 | depends on ARCH_PXA_PALM | ||
| 295 | select PXA27x | ||
| 296 | select IWMMXT | ||
| 297 | help | ||
| 298 | Say Y here if you intend to run this kernel on Palm Zire 72 | ||
| 299 | handheld computer. | ||
| 300 | |||
| 291 | config MACH_PCM990_BASEBOARD | 301 | config MACH_PCM990_BASEBOARD |
| 292 | bool "PHYTEC PCM-990 development board" | 302 | bool "PHYTEC PCM-990 development board" |
| 293 | select HAVE_PWM | 303 | select HAVE_PWM |