From c89d22090097e5521cf84d999b6944c4d8a4973b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 17 Oct 2017 10:12:29 +0200 Subject: [PATCH] media: drop explicit setting of DVB_MAX_ADAPTERS to follow upstream default Upstream bumped the default value from 8 to 16 for 4.10 in commit 90866b3a8011 ("[media] Raise adapter number limit") . Automatically follow the upstream default value by dropping the explicit value of 8. --- debian/changelog | 3 +++ debian/config/config | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 72ebbbbb1..37455d829 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,9 @@ linux (4.14~rc4-1~exp1) UNRELEASED; urgency=medium - a2091, a3000, a4000t, bvme6000_scsi, gvp11, mvme16x_scsi, zorro7xx * [m68k] Build uncompressed kernel image by default. + [ Uwe Kleine-König ] + * media: drop explicit setting of DVB_MAX_ADAPTERS to follow upstream default + -- Ben Hutchings Wed, 04 Oct 2017 01:44:24 +0100 linux (4.14~rc3-1~exp1) experimental; urgency=medium diff --git a/debian/config/config b/debian/config/config index 409c83157..3311d70b5 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1798,7 +1798,6 @@ CONFIG_SMS_SIANO_RC=y ## ## file: drivers/media/dvb-core/Kconfig ## -CONFIG_DVB_MAX_ADAPTERS=8 CONFIG_DVB_DYNAMIC_MINORS=y ##