diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-23 00:00:22 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-23 00:00:22 +0100 |
| commit | f3afce26de53793dfeab74aabfbf4871ddab08d5 (patch) | |
| tree | 97d62f8b55f7850711cbf7351cb627ea48a3ad19 /arch/arm/Makefile | |
| parent | ARM: multi_v7_defconfig: enable rk808 clkout module (diff) | |
| parent | ARM: imx_v6_v7_defconfig: enable PCI_MSI (diff) | |
| download | linux-f3afce26de53793dfeab74aabfbf4871ddab08d5.tar.xz linux-f3afce26de53793dfeab74aabfbf4871ddab08d5.zip | |
Merge tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig
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>
Diffstat (limited to 'arch/arm/Makefile')
0 files changed, 0 insertions, 0 deletions