summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl.config
diff options
context:
space:
mode:
Diffstat (limited to 'kernel-armv7hl.config')
-rw-r--r--kernel-armv7hl.config15
1 files changed, 10 insertions, 5 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6af2475ab..136fb5dc0 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1353,17 +1353,13 @@ CONFIG_DRM_EXYNOS7_DECON=y
CONFIG_DRM_EXYNOS_DPI=y
CONFIG_DRM_EXYNOS_DP=y
CONFIG_DRM_EXYNOS_DSI=y
-CONFIG_DRM_EXYNOS_FIMC=y
CONFIG_DRM_EXYNOS_FIMD=y
CONFIG_DRM_EXYNOS_G2D=y
-CONFIG_DRM_EXYNOS_GSC=y
CONFIG_DRM_EXYNOS_HDMI=y
# CONFIG_DRM_EXYNOS_IOMMU is not set
-CONFIG_DRM_EXYNOS_IPP=y
CONFIG_DRM_EXYNOS=m
CONFIG_DRM_EXYNOS_MIC=y
CONFIG_DRM_EXYNOS_MIXER=y
-CONFIG_DRM_EXYNOS_ROTATOR=y
CONFIG_DRM_EXYNOS_VIDI=y
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=100
@@ -1514,6 +1510,7 @@ CONFIG_DVB_FIREDTV=m
CONFIG_DVB_HOPPER=m
CONFIG_DVB_MANTIS=m
CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_MMAP is not set
CONFIG_DVB_MN88472=m
CONFIG_DVB_MN88473=m
CONFIG_DVB_NETUP_UNIDVB=m
@@ -1527,6 +1524,7 @@ CONFIG_DVB_PT1=m
CONFIG_DVB_SMIPCIE=m
CONFIG_DVB_TTUSB_BUDGET=m
CONFIG_DVB_TTUSB_DEC=m
+# CONFIG_DVB_ULE_DEBUG is not set
CONFIG_DVB_USB_A800=m
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
@@ -1772,6 +1770,7 @@ CONFIG_FCOE=m
CONFIG_FEALNX=m
CONFIG_FEC=m
CONFIG_FHANDLE=y
+# CONFIG_FIND_BIT_BENCHMARK is not set
# CONFIG_FIREWIRE is not set
CONFIG_FIREWIRE_NET=m
CONFIG_FIREWIRE_NOSY=m
@@ -2973,11 +2972,11 @@ CONFIG_LIBFCOE=m
CONFIG_LIQUIDIO_VF=m
CONFIG_LIRC_BT829=m
CONFIG_LIRC_IMON=m
-CONFIG_LIRC=m
CONFIG_LIRC_PARALLEL=m
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
CONFIG_LIRC_STAGING=y
+CONFIG_LIRC=y
CONFIG_LIRC_ZILOG=m
# CONFIG_LIVEPATCH is not set
# CONFIG_LKDTM is not set
@@ -3149,6 +3148,7 @@ CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_SAS=m
+CONFIG_MELLANOX_PLATFORM=y
CONFIG_MEMCG_SWAP_ENABLED=y
CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
@@ -3325,6 +3325,7 @@ CONFIG_MLX5_MPFS=y
# CONFIG_MLX90614 is not set
CONFIG_MLX_CPLD_PLATFORM=m
CONFIG_MLXFW=m
+CONFIG_MLXREG_HOTPLUG=m
CONFIG_MLXSW_CORE_HWMON=y
CONFIG_MLXSW_CORE=m
CONFIG_MLXSW_CORE_THERMAL=y
@@ -4307,6 +4308,8 @@ CONFIG_PCIEAER=y
# CONFIG_PCIE_ARMADA_8K is not set
# CONFIG_PCIEASPM_DEBUG is not set
CONFIG_PCIEASPM=y
+CONFIG_PCIE_CADENCE_EP=y
+CONFIG_PCIE_CADENCE_HOST=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_HOST_ECAM is not set
CONFIG_PCIE_DW_HOST=y
@@ -5029,6 +5032,7 @@ CONFIG_RTLLIB=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTLWIFI=m
# CONFIG_RTS5208 is not set
+CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_S2IO=m
CONFIG_S3C2410_WATCHDOG=m
# CONFIG_SAMPLES is not set
@@ -6183,6 +6187,7 @@ CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
CONFIG_TEGRA_MC=y
CONFIG_TEGRA_SOCTHERM=m
+CONFIG_TEGRA_VDE=m
CONFIG_TEGRA_WATCHDOG=m
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m