diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-02 07:58:11 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-02 07:58:11 +0200 |
commit | aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8 (patch) | |
tree | 699edc93f7996ef5ede88bf43998af3f582ba592 /config-armv7-lpae | |
parent | 651697182b0b06fe2c9261ee1902068a95931020 (diff) | |
parent | 84558c957b3e0cdd17000affcbdbe22301443bfa (diff) | |
download | kernel-4.6.1-300.vanilla.knurd.1.fc24.tar.gz kernel-4.6.1-300.vanilla.knurd.1.fc24.tar.xz kernel-4.6.1-300.vanilla.knurd.1.fc24.zip |
merge stabilization branchkernel-4.6.1-300.vanilla.knurd.1.fc24kernel-4.6.1-300.vanilla.knurd.1.fc23kernel-4.6.1-300.vanilla.knurd.1.fc22
Diffstat (limited to 'config-armv7-lpae')
-rw-r--r-- | config-armv7-lpae | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-armv7-lpae b/config-armv7-lpae index 483c49960..96d49e88a 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -27,7 +27,6 @@ CONFIG_ARM_ERRATA_773022=y CONFIG_KVM=y CONFIG_KVM_ARM_HOST=y -CONFIG_KVM_ARM_MAX_VCPUS=8 # CONFIG_XEN is not set CONFIG_XEN_FBDEV_FRONTEND=y @@ -62,6 +61,7 @@ CONFIG_KEYSTONE_IRQ=m CONFIG_PCI_KEYSTONE=y CONFIG_MTD_NAND_DAVINCI=m CONFIG_GPIO_SYSCON=m +CONFIG_TI_MESSAGE_MANAGER=m # Tegra (non A15 device options) # CONFIG_ARCH_TEGRA_2x_SOC is not set @@ -71,7 +71,6 @@ CONFIG_GPIO_SYSCON=m # CONFIG_SPI_TEGRA20_SFLASH is not set # CONFIG_SPI_TEGRA20_SLINK is not set # CONFIG_MFD_MAX8907 is not set -# CONFIG_MFD_NVEC is not set # CONFIG_SND_SOC_TEGRA_ALC5632 is not set # CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set # CONFIG_SND_SOC_TEGRA_WM8753 is not set @@ -80,4 +79,5 @@ CONFIG_GPIO_SYSCON=m # CONFIG_SND_SOC_TEGRA20_AC97 is not set # CONFIG_SND_SOC_TEGRA20_DAS is not set # CONFIG_SND_SOC_TEGRA20_SPDIF is not set -# CONFIG_SND_SOC_TEGRA_RT5677 is not set +# CONFIG_DRM_OMAP is not set +# CONFIG_AM335X_PHY_USB is not set |