]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'imx-defconfig-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn...
authorOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 13:35:07 +0000 (06:35 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 13:35:07 +0000 (06:35 -0700)
commit9920c8ffc90db0bb02da0de39d7f06c9e4d6e784
tree7f312fad6987c2c1a9483bc7ee70d7993aa0702b
parent8dd8b0277acbdc0d62144c3315ecdb7c0f0c9bd0
parentb19295f7bc676acfdc4f8b071c93b441e2869463
Merge tag 'imx-defconfig-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

i.MX defconfig updates for 4.12:
 - Enable MAX11801 and HID_MULTITOUCH touch drivers.
 - Enable SMSC_PHY driver, as imx6sl-evk board has a LAN8720A ethernet
   phy supported by it.

* tag 'imx-defconfig-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select SMSC_PHY
  ARM: imx_v6_v7_defconfig: Select hid-multitouchdriver
  ARM: imx_v6_v7_defconfig: Select max11801_ts touchscreen driver

Signed-off-by: Olof Johansson <olof@lixom.net>