summary refs log tree commit diff
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-26 12:11:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-26 12:11:23 -0700
commitabea9629486cf973369a641e190e739b3010bb03 (patch)
treedebf0988ddf1824aba8dc6d3d18cb79ee042c2c7 /arch/arm/Makefile
parentf5dcb68086ba2e033b2af32b0da0c7a7c7872a09 (diff)
parentdec36f6ab89db2ae80a0a61f26e1ca1f6a61b651 (diff)
downloadlinux-abea9629486cf973369a641e190e739b3010bb03.tar.gz
Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC defconfig updates from Kevin Hilman:
 "We keep collecting defconfig updates in a separate branch mostly to
  encourage people to handle them separately and avoid conflicts between
  different topics.

  Most of these are enablement of new SoCs, boards or drivers that have
  come in, or minor config refreshes due to reorderings in Kconfig
  files, etc.  I.e. mostly minor churn of various kinds"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
  ARM: multi_v7_defconfig: remove duplicate CONFIG_COMMON_CLK_QCOM=y
  ARM: multi_v7_defconfig: Enable display on Trats2 board
  ARM64: add GPIO keys to the defconfig
  ARM: keystone: defconfig: enable netcp driver by default
  ARM: exynos_defconfig: Enable CONFIG_SENSORS_INA2XX for Odroid-XU3
  ARM: exynos_defconfig: Enable CONFIG_SENSORS_PWM_FAN for Odroid-XU3
  ARM: omap2plus_defconfig: Enable TOUCHSCREEN_PIXCIR
  ARM: omap2plus_defconfig: Add dm816x USB PHY as a loadable module
  ARM: omap2plus_defconifg: Enable DM9000 in omap2plus_defconfig
  ARM: lpc18xx: remove DEBUG_LL_UART_8250 from defconfig
  ARM: multi_v7_defconfig: Make media support modular
  ARM: multi_v7_defconfig: Make sound support modular
  ARM: multi_v7_defconfig: Enable shmobile r8a7778/bockw platform
  ARM: exynos_defconfig: savedefconfig
  ARM: exynos_defconfig: Enable display on Trats2 board
  ARM: multi_v7_defconfig: Enable OHCI on exynos SoCs
  ARM: multi_v7_defconfig: Enable TMU for exynos SoCs
  ARM: multi_v7_defconfig: Enable PMIC and MUIC drivers for exynos
  ARM: multi_v7_defconfig: Enable CPU idle for exynos SoCs
  ARM: multi_v7_defconfig: Enable Cypress APA I2C Trackpad support
  ...
Diffstat (limited to 'arch/arm/Makefile')
0 files changed, 0 insertions, 0 deletions