Merge tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng...
authorOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 23:00:22 +0000 (15:00 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 23:00:22 +0000 (15:00 -0800)
The i.MX defconfig updates for 4.5:
- Drop CONFIG_SOC_LS1021A support, as it needs LPAE which is not
  available with imx_v6_v7_defconfig.
- Enable VF610_ADC, HDMI audio and PCI_MSI support

* tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: enable PCI_MSI
  ARM: imx_v6_v7_defconfig: Select HDMI audio support
  ARM: imx_v6_v7_defconfig: Select VF610_ADC
  ARM: imx_v6_v7_defconfig: Remove CONFIG_SOC_LS1021A

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

Trivial merge