diff options
| -rw-r--r-- | kernel-aarch64-debug.config | 22 | ||||
| -rw-r--r-- | kernel-aarch64.config | 22 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 22 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 22 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 22 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 22 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 24 | ||||
| -rw-r--r-- | kernel-i686.config | 24 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 24 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 24 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 24 | ||||
| -rw-r--r-- | kernel-s390x.config | 24 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 24 | ||||
| -rw-r--r-- | kernel-x86_64.config | 24 | ||||
| -rw-r--r-- | rebase-notes.txt | 1 |
15 files changed, 9 insertions, 316 deletions
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index c26a66ad2..c745b146f 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2764,17 +2764,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m # CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m @@ -3390,17 +3379,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 38878cb9c..192df9033 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2748,17 +2748,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m # CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m @@ -3371,17 +3360,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index eb617c6d5..cec2b9ac1 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2801,17 +2801,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m # CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m @@ -3458,17 +3447,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 6f50618cf..66160f1e2 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2705,17 +2705,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m # CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m @@ -3346,17 +3335,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 7a60ab8b5..bbb6e342d 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2690,17 +2690,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m # CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m @@ -3328,17 +3317,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 2a9bb5c15..83c2017e0 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2786,17 +2786,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m # CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m @@ -3440,17 +3429,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index e029c75b5..1ad12cade 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2530,18 +2530,7 @@ CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_ISDN=y +# CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m CONFIG_ISL29020=m @@ -3137,17 +3126,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set diff --git a/kernel-i686.config b/kernel-i686.config index 6021e2d2b..47cb8efba 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2513,18 +2513,7 @@ CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_ISDN=y +# CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m CONFIG_ISL29020=m @@ -3118,17 +3107,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 83affccca..6d5a7c928 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2287,18 +2287,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_ISDN=y +# CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m CONFIG_ISL29020=m @@ -2878,17 +2867,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 4b6087344..a06cc62d2 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2270,18 +2270,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_ISDN=y +# CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m CONFIG_ISL29020=m @@ -2858,17 +2847,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index a40aed47a..e59d32127 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2262,18 +2262,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_ISDN=y +# CONFIG_ISDN is not set # CONFIG_ISI is not set # CONFIG_ISL29003 is not set # CONFIG_ISL29020 is not set @@ -2851,17 +2840,6 @@ CONFIG_MINIX_SUBPARTITION=y CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set # CONFIG_MISC_RTSX_USB is not set -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -# CONFIG_MISDN_HFCMULTI is not set -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m diff --git a/kernel-s390x.config b/kernel-s390x.config index c20fe8d8a..45076e6f7 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2245,18 +2245,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_ISDN=y +# CONFIG_ISDN is not set # CONFIG_ISI is not set # CONFIG_ISL29003 is not set # CONFIG_ISL29020 is not set @@ -2831,17 +2820,6 @@ CONFIG_MINIX_SUBPARTITION=y CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set # CONFIG_MISC_RTSX_USB is not set -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -# CONFIG_MISDN_HFCMULTI is not set -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index a8c29a08e..7da3fc7ae 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2583,18 +2583,7 @@ CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_ISDN=y +# CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m CONFIG_ISL29020=m @@ -3190,17 +3179,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m # CONFIG_MK8 is not set CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 10ceb523c..47475f7f7 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2566,18 +2566,7 @@ CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_ISDN=y +# CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m CONFIG_ISL29020=m @@ -3171,17 +3160,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m # CONFIG_MK8 is not set CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y diff --git a/rebase-notes.txt b/rebase-notes.txt index 30e397b1e..379d0f740 100644 --- a/rebase-notes.txt +++ b/rebase-notes.txt @@ -1,5 +1,6 @@ Linux 5.3 rebase notes: - Need to re-enable ISDN + Should be able to just revert a2832dc62417 and ./build_config.sh For all F29 and F30 builds: - Re-enable i686 |