diff options
author | Olof Johansson <olof@lixom.net> | 2015-10-23 10:56:01 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-10-23 10:56:01 -0700 |
commit | 302f9f6b165d6f96b4746866e5e69248523926fb (patch) | |
tree | 69e664061f03a6f28ccde6e7a4e7aeffc140d9da /arch/arm/mach-spear/pl080.c | |
parent | 57dbe1baaceacb034b4c00050f04c1a3b726e9c7 (diff) | |
parent | ed1098e4738d935cef12833b08916f6f5e700652 (diff) | |
download | blackbird-op-linux-302f9f6b165d6f96b4746866e5e69248523926fb.tar.gz blackbird-op-linux-302f9f6b165d6f96b4746866e5e69248523926fb.zip |
Merge tag 'imx-defconfig-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig
The i.MX defconfig updates for 4.4:
- Enable i.MX6UL touchscreen controller support.
- Remove CONFIG_VMSPLIT_2G option since we already enabled
CONFIG_HIGHMEM support.
* tag 'imx-defconfig-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v6_v7_defconfig: Remove CONFIG_VMSPLIT_2G
ARM: imx_v6_v7_defconfig: enable imx6ul_tsc
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-spear/pl080.c')
0 files changed, 0 insertions, 0 deletions