summaryrefslogtreecommitdiff
path: root/arch/arm/configs/sam9_l9260_defconfig
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-04 07:45:56 (GMT)
committerPaul Mundt <lethal@linux-sh.org>2010-01-04 07:45:56 (GMT)
commit921a220857cdd3c553cde7c114f9f6757ac80cd5 (patch)
tree526610397dfb83d72c43c94300deea23d26e782a /arch/arm/configs/sam9_l9260_defconfig
parent17eb9d62828c3688f41f31ac00d7fee6da9675bf (diff)
parent2f48912d1443a796f10c42c89cb386f0e3eca04d (diff)
downloadlinux-921a220857cdd3c553cde7c114f9f6757ac80cd5.tar.xz
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm/configs/sam9_l9260_defconfig')
-rw-r--r--arch/arm/configs/sam9_l9260_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/sam9_l9260_defconfig b/arch/arm/configs/sam9_l9260_defconfig
index 1174e27..81b290a 100644
--- 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