Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes

[linux-2.6-block.git] / arch / arm / configs / em_x270_defconfig

diff --git a/arch/arm/configs/em_x270_defconfig b/arch/arm/configs/em_x270_defconfig
index e9955b786c8041f5f07553f2b40a0946a1afa156..2bee932439f6f7a9ee33322366f3b7fb874f169f 100644 (file)
--- a/arch/arm/configs/em_x270_defconfig
+++ b/arch/arm/configs/em_x270_defconfig
@@ -202,7 +202,6 @@ CONFIG_PXA_SSP=y
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y