Update CONFIG_DVB_MAX_ADAPTERS to upstream defaults (changed in 3.7)

17 files changed, 17 insertions, 21 deletions

diff --git a/configs/fedora/generic/CONFIG_DVB_MAX_ADAPTERS b/configs/fedora/generic/CONFIG_DVB_MAX_ADAPTERS
index 01b45579f..2d31b409b 100644
--- a/configs/fedora/generic/CONFIG_DVB_MAX_ADAPTERS
+++ b/configs/fedora/generic/CONFIG_DVB_MAX_ADAPTERS
@@ -1 +1 @@
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 9918ce95f..901020fdf 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1565,7 +1565,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
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 7a42b50d8..60148c0cd 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1555,7 +1555,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
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 51031ee15..58665170a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1663,7 +1663,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
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 3f07c0fa3..0cf0ce205 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1574,7 +1574,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
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ecdaa09d7..1c80d4ec6 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1564,7 +1564,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
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 30fed9601..33a0fb6f4 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1653,7 +1653,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
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index eb167e5cc..09744ba1c 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1376,7 +1376,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
diff --git a/kernel-i686.config b/kernel-i686.config
index fb3475427..b0d93b6d4 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1363,7 +1363,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
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
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index c72eefb2f..d36a877a3 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1311,7 +1311,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
@@ -1567,7 +1567,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
@@ -5790,7 +5789,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
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 6775f19f2..a3816d308 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1279,7 +1279,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
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 218abc022..5aa4a10fe 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1266,7 +1266,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
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 1ca9bdba2..8a3fe86a4 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1278,7 +1278,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
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 24bff5cef..13db9ca0d 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1265,7 +1265,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
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 4633b63df..05bed661b 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1422,7 +1422,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
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index cf78223dd..3b01776af 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1409,7 +1409,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