summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-01-03 01:26:01 +0000
committerPeter Robinson <pbrobinson@gmail.com>2019-01-03 01:26:01 +0000
commited8f2690bd43659b34bab213b8e01709c2679128 (patch)
treebc7a261f2d8518f3c4fa6327650b64577049c587
parenta2e4f52009334eb3905f71425402840f54aa9eaa (diff)
downloadkernel-ed8f2690bd43659b34bab213b8e01709c2679128.tar.gz
kernel-ed8f2690bd43659b34bab213b8e01709c2679128.tar.xz
kernel-ed8f2690bd43659b34bab213b8e01709c2679128.zip
Drop ISN Eicon driver, deleted upstream
-rw-r--r--configs/fedora/generic/CONFIG_CAPI_EICON1
-rw-r--r--configs/fedora/generic/CONFIG_ISDN_DIVAS1
-rw-r--r--configs/fedora/generic/CONFIG_ISDN_DIVAS_BRIPCI1
-rw-r--r--configs/fedora/generic/CONFIG_ISDN_DIVAS_DIVACAPI1
-rw-r--r--configs/fedora/generic/CONFIG_ISDN_DIVAS_MAINT1
-rw-r--r--configs/fedora/generic/CONFIG_ISDN_DIVAS_PRIPCI1
-rw-r--r--configs/fedora/generic/CONFIG_ISDN_DIVAS_USERIDI1
-rw-r--r--configs/fedora/generic/powerpc/CONFIG_CAPI_EICON1
-rw-r--r--configs/fedora/generic/x86/CONFIG_CAPI_EICON1
-rw-r--r--kernel-aarch64-debug.config7
-rw-r--r--kernel-aarch64.config7
-rw-r--r--kernel-armv7hl-debug.config7
-rw-r--r--kernel-armv7hl-lpae-debug.config7
-rw-r--r--kernel-armv7hl-lpae.config7
-rw-r--r--kernel-armv7hl.config7
-rw-r--r--kernel-i686-debug.config7
-rw-r--r--kernel-i686.config7
-rw-r--r--kernel-ppc64le-debug.config7
-rw-r--r--kernel-ppc64le.config7
-rw-r--r--kernel-s390x-debug.config7
-rw-r--r--kernel-s390x.config7
-rw-r--r--kernel-x86_64-debug.config7
-rw-r--r--kernel-x86_64.config7
23 files changed, 0 insertions, 107 deletions
diff --git a/configs/fedora/generic/CONFIG_CAPI_EICON b/configs/fedora/generic/CONFIG_CAPI_EICON
deleted file mode 100644
index 546c0b3f7..000000000
--- a/configs/fedora/generic/CONFIG_CAPI_EICON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CAPI_EICON is not set
diff --git a/configs/fedora/generic/CONFIG_ISDN_DIVAS b/configs/fedora/generic/CONFIG_ISDN_DIVAS
deleted file mode 100644
index 20ade7fd7..000000000
--- a/configs/fedora/generic/CONFIG_ISDN_DIVAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ISDN_DIVAS=m
diff --git a/configs/fedora/generic/CONFIG_ISDN_DIVAS_BRIPCI b/configs/fedora/generic/CONFIG_ISDN_DIVAS_BRIPCI
deleted file mode 100644
index 5341235cf..000000000
--- a/configs/fedora/generic/CONFIG_ISDN_DIVAS_BRIPCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ISDN_DIVAS_BRIPCI=y
diff --git a/configs/fedora/generic/CONFIG_ISDN_DIVAS_DIVACAPI b/configs/fedora/generic/CONFIG_ISDN_DIVAS_DIVACAPI
deleted file mode 100644
index 66f6d18b6..000000000
--- a/configs/fedora/generic/CONFIG_ISDN_DIVAS_DIVACAPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ISDN_DIVAS_DIVACAPI=m
diff --git a/configs/fedora/generic/CONFIG_ISDN_DIVAS_MAINT b/configs/fedora/generic/CONFIG_ISDN_DIVAS_MAINT
deleted file mode 100644
index 48c3e83ec..000000000
--- a/configs/fedora/generic/CONFIG_ISDN_DIVAS_MAINT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ISDN_DIVAS_MAINT=m
diff --git a/configs/fedora/generic/CONFIG_ISDN_DIVAS_PRIPCI b/configs/fedora/generic/CONFIG_ISDN_DIVAS_PRIPCI
deleted file mode 100644
index 203e7a136..000000000
--- a/configs/fedora/generic/CONFIG_ISDN_DIVAS_PRIPCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ISDN_DIVAS_PRIPCI=y
diff --git a/configs/fedora/generic/CONFIG_ISDN_DIVAS_USERIDI b/configs/fedora/generic/CONFIG_ISDN_DIVAS_USERIDI
deleted file mode 100644
index dfd75f70c..000000000
--- a/configs/fedora/generic/CONFIG_ISDN_DIVAS_USERIDI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ISDN_DIVAS_USERIDI=m
diff --git a/configs/fedora/generic/powerpc/CONFIG_CAPI_EICON b/configs/fedora/generic/powerpc/CONFIG_CAPI_EICON
deleted file mode 100644
index 70c2616e4..000000000
--- a/configs/fedora/generic/powerpc/CONFIG_CAPI_EICON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CAPI_EICON=y
diff --git a/configs/fedora/generic/x86/CONFIG_CAPI_EICON b/configs/fedora/generic/x86/CONFIG_CAPI_EICON
deleted file mode 100644
index 70c2616e4..000000000
--- a/configs/fedora/generic/x86/CONFIG_CAPI_EICON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CAPI_EICON=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 2a48ae13e..ec1374df7 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -821,7 +821,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
CONFIG_CAN_XILINXCAN=m
CONFIG_CAPI_AVM=y
-# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2722,12 +2721,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 8ea52b984..32fa6805a 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -821,7 +821,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
CONFIG_CAN_XILINXCAN=m
CONFIG_CAPI_AVM=y
-# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2705,12 +2704,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index e6466cf58..fe8860782 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -852,7 +852,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2847,12 +2846,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 6f55ca95b..ddb579a8f 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -826,7 +826,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2715,12 +2714,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 726a9c6d7..efdd6d874 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -826,7 +826,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2699,12 +2698,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 4b82b243e..6c4b3844a 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -852,7 +852,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2831,12 +2830,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 304ca3a7a..a0bca41b4 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -697,7 +697,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-CONFIG_CAPI_EICON=y
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2587,12 +2586,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-i686.config b/kernel-i686.config
index dd3e5565a..fee444148 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -696,7 +696,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-CONFIG_CAPI_EICON=y
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2569,12 +2568,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index cf0bf1c8b..7d588ec90 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -638,7 +638,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-CONFIG_CAPI_EICON=y
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2368,12 +2367,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index b71eb8e89..5f58ce904 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -637,7 +637,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-CONFIG_CAPI_EICON=y
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2350,12 +2349,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index a669bcb16..79cf77419 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -637,7 +637,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2318,12 +2317,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index ffe76f308..8356b7f2d 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -636,7 +636,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2300,12 +2299,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 4358190cc..b64c1f632 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -711,7 +711,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-CONFIG_CAPI_EICON=y
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2640,12 +2639,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index f0a73ce0a..459d18b57 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -710,7 +710,6 @@ CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
-CONFIG_CAPI_EICON=y
# CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m
@@ -2622,12 +2621,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m