diff --git a/[refs] b/[refs] index 81ab1e17f335..56e02b00bca7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 880113eff2f7703f61f70361ba37d72941e2906d +refs/heads/master: a5b44ca6d798d46f17d0e90c7a93d92fb4496daa diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig index 86eec4159cbc..0e74ba0cefd1 100644 --- a/trunk/arch/arm/mach-pxa/Kconfig +++ b/trunk/arch/arm/mach-pxa/Kconfig @@ -160,7 +160,6 @@ config MACH_XCEP select MTD select MTD_CFI select MTD_CFI_INTELEXT - select MTD_CHAR select MTD_PHYSMAP select PXA25x select SMC91X