summaryrefslogtreecommitdiff
path: root/arch/arm/configs/quartz_defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/configs/quartz_defconfig')
-rw-r--r--arch/arm/configs/quartz_defconfig5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/configs/quartz_defconfig b/arch/arm/configs/quartz_defconfig
index f7faa04e9924..df94a55a3837 100644
--- a/arch/arm/configs/quartz_defconfig
+++ b/arch/arm/configs/quartz_defconfig
@@ -293,7 +293,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_ARCH_MVFA5=y
CONFIG_SOC_MVFA5=y
# CONFIG_MACH_MVFA5_TWR_VF700 is not set
-CONFIG_MACH_QDK=y
+CONFIG_MACH_DS_QUARTZ=y
CONFIG_ISP1504_MXC=y
# CONFIG_MXC_IRQ_PRIOR is not set
# CONFIG_MXC_PWM is not set
@@ -2184,9 +2184,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
-# CONFIG_BRANCH_PROFILE_NONE is not set
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
# CONFIG_DYNAMIC_DEBUG is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_ATOMIC64_SELFTEST is not set