diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2009-02-09 17:34:06 +0100 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 21:22:33 +0800 |
| commit | d62ab6e26dbda4d5e183ccbbce9909c5667b20ef (patch) | |
| tree | aeb925339ead599ae83b30c9e83af6012f165a92 /arch | |
| parent | 23804614230be43185b7d9b5ef97a8b87375c3cc (diff) | |
[ARM] pxa/magician: select PXA_SSP for touchscreen and sound
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/magician_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index 91bc3974f19..82428c2f234 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig @@ -196,6 +196,7 @@ CONFIG_MACH_MAGICIAN=y # CONFIG_ARCH_PXA_PALM is not set # CONFIG_PXA_EZX is not set CONFIG_PXA27x=y +CONFIG_PXA_SSP=y CONFIG_PXA_PWM=y CONFIG_PXA_HAVE_BOARD_IRQS=y diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 04d1a07ced7..33214c1e060 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -302,6 +302,7 @@ config MACH_MAGICIAN bool "Enable HTC Magician Support" select PXA27x select IWMMXT + select PXA_SSP select HAVE_PWM select PXA_HAVE_BOARD_IRQS |