diff --git a/[refs] b/[refs] index a5e4b7974a10..4bf7a3499fe4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e277479aba3d35745c822540e9c3d941aabb4e98 +refs/heads/master: d0f7f1dff01698d228dc108895fbb9b13af37dab diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig index faa2c3f6c1af..61a131fd44a7 100644 --- a/trunk/arch/arm/mach-pxa/Kconfig +++ b/trunk/arch/arm/mach-pxa/Kconfig @@ -189,7 +189,6 @@ config MACH_ARMCORE config MACH_MAGICIAN bool "Enable HTC Magician Support" - depends on ARCH_PXA select PXA27x select IWMMXT