From 9bc6989237278a94ca94dfcf1f3e4f7ab2ff8336 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 19 Dec 2018 12:22:40 -0600
Subject: Update CONFIG_DVB_MAX_ADAPTERS to upstream defaults (changed in 3.7)

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

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

diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index f4bd12b49..bdcdc4c83 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1324,7 +1324,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
@@ -1588,7 +1588,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
@@ -5817,7 +5816,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
 CONFIG_UPROBE_EVENTS=y
 # CONFIG_US5182D is not set
 CONFIG_USB_ACM=m
-- 
cgit