diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-15 15:41:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-15 15:41:04 -0800 |
| commit | 775fadd09e7beac2fc61cc0517629e9fa69bdb56 (patch) | |
| tree | bf3e38d981d14ae4457bdd5d539e0e0f3f8aaf79 /arch/arm/configs/qcom_defconfig | |
| parent | e79ab194d15e1baa25540cb9efaf2a459cf4bc32 (diff) | |
| parent | 9f793ef32fc6bf8ae8ca49e3adcdca7143553b58 (diff) | |
Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC defconfig updates from Arnd Bergmann:
"Defconfig additions, removals, etc. Most of these are small changes
adding the options for newly upstreamed drivers, or drivers needed for
new board support.
Bartlomiej Zolnierkiewicz has done a series of patches reducing the
use of CONFIG_IDE from 19 to 3 in favor of CONFIG_ATA.
Overall more patches than usual, but nothing big"
* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
ARM: davinci_all_defconfig: Enable da8xx usb otg
ARM: defconfig: drop GPIO_SYSFS on multiplatforms
ARM: multi_v7_defconfig: enable STMicroelectronics HVA driver
ARM: configs: Add new config fragment to change RAM start point
ARM: davinci_all_defconfig: Enable OHCI as module
ARM: defconfig: turn on the DT cpufreq for Integrator
ARM: omap2plus_defconfig: Run make savedefconfig to save some space
ARM: davinci_all_defconfig: add missing options for systemd
ARM: davinci_all_defconfig: enable the mstpri and ddrctl drivers
ARM: bcm2835: add thermal driver to default config
ARM: omap2plus_defconfig: Enable LP873X support
ARM: omap2plus_defconfig: Enable REGULATOR_GPIO
ARM: omap2plus_defconfig: Enable TOUCHSCREEN_TSC2004
ARM: socfpga_defconfig: enable FS configs to support Angstrom filesystem
ARM: config: Enable GPIO Key driver in stm32_defconfig
ARM: tegra: Enable GMI driver in default configuration
ARM: tegra: Enable SGTL5000 audio
ARM: tegra: Update default configuration for v4.9-rc1
ARM: socfpga: updates for socfpga_defconfig
ARM: davinci_all_defconfig: enable LED default-on trigger
...
Diffstat (limited to 'arch/arm/configs/qcom_defconfig')
| -rw-r--r-- | arch/arm/configs/qcom_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index 74e9cd759b99..8c3a0108a231 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -161,8 +161,8 @@ CONFIG_APQ_MMCC_8084=y CONFIG_IPQ_LCC_806X=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_LCC_8960=y -CONFIG_MSM_GCC_9615=y -CONFIG_MSM_LCC_9615=y +CONFIG_MDM_GCC_9615=y +CONFIG_MDM_LCC_9615=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y CONFIG_HWSPINLOCK_QCOM=y |