From ed622fefe80435df0a0a56f2371cd1b024b7ac82 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 10 May 2017 18:20:47 +0100
Subject: minor merge window cleanups

---
 kernel-armv7hl-debug.config | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'kernel-armv7hl-debug.config')

diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index ff9dc5b35..23ee6cd83 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1018,7 +1018,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
@@ -1539,7 +1538,6 @@ CONFIG_EDAC_GHES=y
 CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_MV64X60=m
 CONFIG_EDAC_SYNOPSYS=m
 CONFIG_EDAC=y
@@ -2072,7 +2070,6 @@ CONFIG_HWMON=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
@@ -2900,7 +2897,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
@@ -5741,6 +5737,7 @@ CONFIG_SOC_OMAP5=y
 CONFIG_SOC_STIH407=y
 # CONFIG_SOC_STIH415 is not set
 # CONFIG_SOC_STIH416 is not set
+CONFIG_SOC_TEGRA_FLOWCTRL=y
 CONFIG_SOC_TI81XX=y
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_VF610 is not set
-- 
cgit