summary refs log tree commit diff
path: root/arch/parisc
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-18 23:09:48 -0700
committerOlof Johansson <olof@lixom.net>2017-06-18 23:09:48 -0700
commit125370a9288fcc5ca09d64942fed44f73277c6c3 (patch)
treecd5ca7f423b9b96633a9ee2f368707a825ea3b9f /arch/parisc
parentde9761ad4e599216ecaa9f3a373369453dd7837f (diff)
parent6db53373884327f0457d90aa665d249a11461b07 (diff)
downloadlinux-125370a9288fcc5ca09d64942fed44f73277c6c3.tar.gz
Merge tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig
The i.MX defconfig updates for 4.13:
 - Enable i.MX7 ADC driver support.
 - Enable THERMAL_WRITABLE_TRIPS, so that i.MX thermal driver can set
   trip points for testing.
 - CONFIG_DEBUG_FS gets lost by accident because of a change around
   CONFIG_RCU_TRACE.  Re-enable it explicitly.
 - Enable MXS LRADC driver and CONFIG_CGROUPS for mxs_defconfig.
 - Enable more common cpufreq governors to help test cpufreq driver.

* tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select CONFIG_IMX7D_ADC
  ARM: imx_v6_v7_defconfig: Set THERMAL_WRITABLE_TRIPS=y for testing
  ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS
  ARM: mxs_defconfig: Re-enable MXS LRADC
  ARM: mxs_defconfig: Enable CONFIG_CGROUPS
  ARM: imx_v6_v7_defconfig: Enable cpufreq governors

Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/parisc')
0 files changed, 0 insertions, 0 deletions