diff options
| author | Roshni Shah <roshni.shah@timesys.com> | 2014-01-09 22:16:58 -0500 |
|---|---|---|
| committer | Roshni Shah <roshni.shah@timesys.com> | 2014-01-09 22:16:58 -0500 |
| commit | 29000e743e28a7174c54e81c3c45a58fe35e17ff (patch) | |
| tree | 7359007991e40400f77d4cb25bb3cc09dcb33d77 /arch/arm/configs/quartz_defconfig | |
| parent | 44f75eb5b6bf1107bec43601972d7a12709f10d5 (diff) | |
Quartz: Update Quartz machine Type and ID.3.0-quartz-ts1.1
Diffstat (limited to 'arch/arm/configs/quartz_defconfig')
| -rw-r--r-- | arch/arm/configs/quartz_defconfig | 5 |
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 |