From 0ce1b7863dd55b597ffb3738ca2e88533a0b3247 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 9 Feb 2009 17:34:06 +0100 Subject: [PATCH] --- yaml --- r: 137181 b: refs/heads/master c: d62ab6e26dbda4d5e183ccbbce9909c5667b20ef h: refs/heads/master i: 137179: 1d3f5d49c9840b65edeb42924f3071223b2228c8 v: v3 --- [refs] | 2 +- trunk/arch/arm/configs/magician_defconfig | 1 + trunk/arch/arm/mach-pxa/Kconfig | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4b37e5097764..8b660f61766c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23804614230be43185b7d9b5ef97a8b87375c3cc +refs/heads/master: d62ab6e26dbda4d5e183ccbbce9909c5667b20ef diff --git a/trunk/arch/arm/configs/magician_defconfig b/trunk/arch/arm/configs/magician_defconfig index 91bc3974f191..82428c2f234c 100644 --- a/trunk/arch/arm/configs/magician_defconfig +++ b/trunk/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/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig index 04d1a07ced7f..33214c1e0607 100644 --- a/trunk/arch/arm/mach-pxa/Kconfig +++ b/trunk/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