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