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

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

diff --git a/arch/arm/configs/shannon_defconfig b/arch/arm/configs/shannon_defconfig
index 984f7096a5338dd327851d5653025d7aa9dba7f7..7c49bc3524624fa9212dd913d463d6e2667b1cab 100644 (file)
--- a/arch/arm/configs/shannon_defconfig
+++ b/arch/arm/configs/shannon_defconfig
@@ -99,7 +99,6 @@ CONFIG_SA1100_SHANNON=y
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_SA1100=y
 CONFIG_CPU_32v4=y
 CONFIG_CPU_ABRT_EV4=y