diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:08:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:09:41 +0200 |
| commit | 48bc03e5411eb0fd006e54ba62ca77a6dfe5c68d (patch) | |
| tree | 8247257ee18ad4fe4b15d4e863b1cad44d170ce2 /usr | |
| parent | b6e3f6d543777eec632b3639a32335e2d04768b3 (diff) | |
| parent | 2ead04d9d69ebded61da063cb5a8ade72da6c8f5 (diff) | |
Merge tag 'imx-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig
Merge "i.MX defconfig updates for 4.7" from Shawn Guo:
- Update multi_v5_defconfig for i.MX21/27 and systemd support
- Update imx_v6_v7_defconfig to support devices found on various i.MX6
board: FT5x06 and TSC2004 touch, I2C GPIO, MICREL PHY and M41T80 RTC
* tag 'imx-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v6_v7_defconfig: add CONFIG_MICREL_PHY
ARM: imx_v6_v7_defconfig: add CONFIG_I2C_GPIO
ARM: multi_v5_defconfig: Enable recommended options for systemd
ARM: multi_v5_defconfig: Enable support for MX21/MX27
ARM: imx_v6_v7_defconfig: add CONFIG_RTC_DRV_M41T80
ARM: imx_v6_v7_defconfig: add CONFIG_I2C_MUX_GPIO
ARM: imx_v6_v7_defconfig: add FT5x06 and TSC2004 touch support
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions