Merge remote branch 'korg/drm-radeon-testing' into drm-next-stage

[~andy/linux] / arch / arm / configs / sam9_l9260_defconfig

diff --git a/arch/arm/configs/sam9_l9260_defconfig b/arch/arm/configs/sam9_l9260_defconfig
index 1174e276487577d92585066e5f69b78aae2b57e2..81b290ad5d257dafe96c9bb72ea25ab5d5cdd63d 100644 (file)
--- a/arch/arm/configs/sam9_l9260_defconfig
+++ b/arch/arm/configs/sam9_l9260_defconfig
@@ -175,7 +175,6 @@ CONFIG_MTD_AT91_DATAFLASH_CARD=y
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_ARM926T=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5TJ=y