diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-05-10 18:20:47 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-05-10 18:20:47 +0100 |
| commit | ed622fefe80435df0a0a56f2371cd1b024b7ac82 (patch) | |
| tree | 72abfd2228cd63207f29b4cb743e38f19ae06376 /kernel-aarch64-debug.config | |
| parent | 48953e19ba24578846ec4aebbbbc0b89ff539b4c (diff) | |
| download | kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.gz kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.tar.xz kernel-ed622fefe80435df0a0a56f2371cd1b024b7ac82.zip | |
minor merge window cleanups
Diffstat (limited to 'kernel-aarch64-debug.config')
| -rw-r--r-- | kernel-aarch64-debug.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index a8ef33093..364f5c206 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1239,6 +1239,7 @@ CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_DUMB_VGA_DAC=m CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_I2S_AUDIO=m +CONFIG_DRM_DW_HDMI=m CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_HDLCD=m @@ -1419,7 +1420,6 @@ CONFIG_ECRYPT_FS=m # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_GHES=y CONFIG_EDAC_LEGACY_SYSFS=y -CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_MV64X60=m CONFIG_EDAC_THUNDERX=m CONFIG_EDAC_XGENE=m @@ -2711,7 +2711,6 @@ CONFIG_LIRC_BT829=m CONFIG_LIRC_IMON=m CONFIG_LIRC=m CONFIG_LIRC_PARALLEL=m -CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m @@ -5253,6 +5252,7 @@ CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m # CONFIG_SOC_CAMERA is not set +CONFIG_SOC_TEGRA_FLOWCTRL=y # CONFIG_SOC_TI is not set # CONFIG_SOC_ZTE is not set CONFIG_SOFT_WATCHDOG=m |