kernel: update config

disable isdn
disable audit
disable profiling on arm
disable scsi driver on arm

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
index e90ba4c4386ac4057d7dd96bf0a2643c24882bc7..214f9ecdc958a1b0a29f86cd43cf1b5546936e3d 100644 (file)
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -52,11 +52,8 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
 # CONFIG_USELIB is not set
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -209,8 +206,6 @@ CONFIG_SLAB_FREELIST_HARDENED=y
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
 # CONFIG_PROFILING is not set
 CONFIG_TRACEPOINTS=y
-CONFIG_CRASH_CORE=y
-CONFIG_KEXEC_CORE=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
@@ -558,7 +553,7 @@ CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_BOUNCE=y
 CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65535
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_CLEANCACHE=y
@@ -593,8 +588,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE=""
-CONFIG_KEXEC=y
-CONFIG_ATAGS_PROC=y
+# CONFIG_KEXEC is not set
 CONFIG_CRASH_DUMP=y
 CONFIG_AUTO_ZRELADDR=y
 # CONFIG_EFI is not set
@@ -887,7 +881,6 @@ CONFIG_NETFILTER_XT_SET=m
 #
 # Xtables targets
 #
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -6007,7 +6000,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 # CONFIG_HARDENED_USERCOPY is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
@@ -6015,7 +6007,6 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 # CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
@@ -6208,7 +6199,6 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=m
 CONFIG_XXHASH=m
-CONFIG_AUDIT_GENERIC=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index d5380e544ac55a0d565371fbe63d8b7685f95796..81e499a8cd80b088b728cb88ee6eafd6ddf3f11f 100644 (file)
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.28 Kernel Configuration
+# Linux/arm 4.14.32-ipfire-multi Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -54,11 +54,8 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
 # CONFIG_USELIB is not set
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -221,9 +218,8 @@ CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
-CONFIG_PROFILING=y
+# CONFIG_PROFILING is not set
 CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
@@ -805,7 +801,7 @@ CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_BOUNCE=y
 CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_CLEANCACHE=y
 # CONFIG_FRONTSWAP is not set
@@ -1154,7 +1150,6 @@ CONFIG_NETFILTER_XT_SET=m
 #
 # Xtables targets
 #
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -1592,7 +1587,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
@@ -1897,7 +1891,8 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 
@@ -2027,88 +2022,56 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_DEBUG_ENABLE=y
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC79XX_DEBUG_ENABLE=y
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-CONFIG_AIC94XX_DEBUG=y
-CONFIG_SCSI_MVSAS=m
-CONFIG_SCSI_MVSAS_DEBUG=y
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-# CONFIG_MEGARAID_MM is not set
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_SMARTPQI=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFS_DWC_TC_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_ESAS2R is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_SMARTPQI is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_SCSI_SNIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_QEDI is not set
-# CONFIG_QEDF is not set
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_LPFC_DEBUG_FS=y
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_NSP32=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_AM53C974 is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_WD719X is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_CHELSIO_FCOE=m
+# CONFIG_SCSI_CHELSIO_FCOE is not set
 CONFIG_SCSI_DH=y
 CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
@@ -2414,7 +2377,6 @@ CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
-CONFIG_CHELSIO_LIB=m
 CONFIG_NET_VENDOR_CIRRUS=y
 CONFIG_CS89x0=m
 CONFIG_CS89x0_PLATFORM=y
@@ -2968,93 +2930,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 #
 # CONFIG_WAN is not set
 CONFIG_VMXNET3=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-# CONFIG_HISAX_TELESPCI is not set
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NICCY=y
-# CONFIG_HISAX_BKM_A4T is not set
-# CONFIG_HISAX_SCT_QUADRO is not set
-CONFIG_HISAX_GAZEL=y
-# CONFIG_HISAX_HFC_PCI is not set
-# CONFIG_HISAX_W6692 is not set
-CONFIG_HISAX_HFC_SX=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-# CONFIG_HISAX_FRITZ_PCIPNP is not set
-CONFIG_ISDN_CAPI=m
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPIDRV=m
-# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
-# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-# CONFIG_ISDN_DRV_AVMB1_C4 is not set
-CONFIG_CAPI_EICON=y
-# CONFIG_ISDN_DIVAS is not set
-# CONFIG_ISDN_DRV_GIGASET is not set
-# CONFIG_HYSDN is not set
-# CONFIG_MISDN is not set
-CONFIG_ISDN_HDLC=m
+# CONFIG_ISDN is not set
 CONFIG_NVM=y
 # CONFIG_NVM_DEBUG is not set
 # CONFIG_NVM_RRPC is not set
@@ -5101,22 +4977,12 @@ CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 # CONFIG_SND_USB_POD is not set
 # CONFIG_SND_USB_PODHD is not set
 # CONFIG_SND_USB_TONEPORT is not set
 # CONFIG_SND_USB_VARIAX is not set
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-# CONFIG_SND_OXFW is not set
-# CONFIG_SND_ISIGHT is not set
-# CONFIG_SND_FIREWORKS is not set
-# CONFIG_SND_BEBOB is not set
-# CONFIG_SND_FIREWIRE_DIGI00X is not set
-# CONFIG_SND_FIREWIRE_TASCAM is not set
-# CONFIG_SND_FIREWIRE_MOTU is not set
-# CONFIG_SND_FIREFACE is not set
+# CONFIG_SND_FIREWIRE is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_AMD_ACP is not set
@@ -7091,7 +6957,6 @@ CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
@@ -7192,7 +7057,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 # CONFIG_HARDENED_USERCOPY is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
@@ -7200,7 +7064,6 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 # CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
@@ -7408,7 +7271,6 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=m
 CONFIG_XXHASH=m
-CONFIG_AUDIT_GENERIC=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
@@ -7440,13 +7302,11 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
 # CONFIG_DMA_NOOP_OPS is not set
 # CONFIG_DMA_VIRT_OPS is not set
-CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 5a430c373f5919dd63f24d04b1ab82ab86d45fbe..eb1c8c148e72a496aa0569da735479f9fcb9fa0d 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.21 Kernel Configuration
+# Linux/x86 4.14.32-ipfire Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -73,11 +73,8 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
 CONFIG_USELIB=y
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -567,7 +564,7 @@ CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 # CONFIG_HWPOISON_INJECT is not set
@@ -1090,7 +1087,6 @@ CONFIG_NETFILTER_XT_SET=m
 #
 # Xtables targets
 #
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -1529,7 +1525,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
@@ -2855,143 +2850,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-# CONFIG_HISAX_16_0 is not set
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-# CONFIG_HISAX_AVM_A1 is not set
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-# CONFIG_HISAX_IX1MICROR2 is not set
-CONFIG_HISAX_DIEHLDIVA=y
-# CONFIG_HISAX_ASUSCOM is not set
-# CONFIG_HISAX_TELEINT is not set
-# CONFIG_HISAX_HFCS is not set
-CONFIG_HISAX_SEDLBAUER=y
-# CONFIG_HISAX_SPORTSTER is not set
-# CONFIG_HISAX_MIC is not set
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-# CONFIG_HISAX_ISURF is not set
-# CONFIG_HISAX_HSTSAPHIR is not set
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-# CONFIG_HISAX_SEDLBAUER_CS is not set
-# CONFIG_HISAX_ELSA_CS is not set
-# CONFIG_HISAX_AVM_A1_CS is not set
-# CONFIG_HISAX_TELES_CS is not set
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-CONFIG_ISDN_CAPI=m
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPIDRV=m
-# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
-# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
+# CONFIG_ISDN is not set
 CONFIG_NVM=y
 # CONFIG_NVM_DEBUG is not set
 CONFIG_NVM_RRPC=m
@@ -6878,7 +6737,6 @@ CONFIG_HARDENED_USERCOPY=y
 CONFIG_HARDENED_USERCOPY_PAGESPAN=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
@@ -6886,7 +6744,6 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
@@ -7124,7 +6981,6 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=m
 CONFIG_XXHASH=m
-CONFIG_AUDIT_GENERIC=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_842_COMPRESS=m

diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 1d29faf9ebbbd38f8fe3c63da8ac8537cb07ec55..622a79647f49c05b382702c86aad9e8a526ae2b4 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.21 Kernel Configuration
+# Linux/x86 4.14.32-ipfire Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -73,11 +73,8 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
 CONFIG_USELIB=y
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -583,7 +580,7 @@ CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 # CONFIG_HWPOISON_INJECT is not set
@@ -1108,7 +1105,6 @@ CONFIG_NETFILTER_XT_SET=m
 #
 # Xtables targets
 #
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -1547,7 +1543,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
@@ -2877,143 +2872,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-# CONFIG_HISAX_16_0 is not set
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-# CONFIG_HISAX_AVM_A1 is not set
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-# CONFIG_HISAX_IX1MICROR2 is not set
-CONFIG_HISAX_DIEHLDIVA=y
-# CONFIG_HISAX_ASUSCOM is not set
-# CONFIG_HISAX_TELEINT is not set
-# CONFIG_HISAX_HFCS is not set
-CONFIG_HISAX_SEDLBAUER=y
-# CONFIG_HISAX_SPORTSTER is not set
-# CONFIG_HISAX_MIC is not set
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-# CONFIG_HISAX_ISURF is not set
-# CONFIG_HISAX_HSTSAPHIR is not set
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-# CONFIG_HISAX_SEDLBAUER_CS is not set
-# CONFIG_HISAX_ELSA_CS is not set
-# CONFIG_HISAX_AVM_A1_CS is not set
-# CONFIG_HISAX_TELES_CS is not set
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-CONFIG_ISDN_CAPI=m
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPIDRV=m
-# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
-# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
+# CONFIG_ISDN is not set
 CONFIG_NVM=y
 # CONFIG_NVM_DEBUG is not set
 CONFIG_NVM_RRPC=m
@@ -6884,7 +6743,6 @@ CONFIG_HARDENED_USERCOPY=y
 CONFIG_HARDENED_USERCOPY_PAGESPAN=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
@@ -6892,7 +6750,6 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
@@ -7129,7 +6986,6 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=m
 CONFIG_XXHASH=m
-CONFIG_AUDIT_GENERIC=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_842_COMPRESS=m

diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 8d80404303ed0e4c6d247503da82534a11303d1d..d5581645307a7b5385fd3c99086d559a7d3dd11b 100644 (file)
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.31 Kernel Configuration
+# Linux/x86 4.14.32-ipfire Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -76,11 +76,8 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
 CONFIG_USELIB=y
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -571,7 +568,7 @@ CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 # CONFIG_HWPOISON_INJECT is not set
@@ -1082,7 +1079,6 @@ CONFIG_NETFILTER_XT_SET=m
 #
 # Xtables targets
 #
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -1522,7 +1518,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
@@ -2831,131 +2826,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-# CONFIG_HISAX_SEDLBAUER_CS is not set
-# CONFIG_HISAX_ELSA_CS is not set
-# CONFIG_HISAX_AVM_A1_CS is not set
-# CONFIG_HISAX_TELES_CS is not set
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-CONFIG_ISDN_CAPI=m
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPIDRV=m
-# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
+# CONFIG_ISDN is not set
 CONFIG_NVM=y
 # CONFIG_NVM_DEBUG is not set
 CONFIG_NVM_RRPC=m
@@ -6731,7 +6602,6 @@ CONFIG_HARDENED_USERCOPY=y
 CONFIG_HARDENED_USERCOPY_PAGESPAN=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
@@ -6739,7 +6609,6 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y

diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi
index 83ee7ace527fc0443cd454f14fb8e098fe66ecb8..e303eeb34f79a46da35c2b95f567e88629de8bd1 100644 (file)
--- a/config/rootfiles/common/armv5tel/linux-multi
+++ b/config/rootfiles/common/armv5tel/linux-multi
@@ -490,7 +490,6 @@ boot/dtb-KVER-ipfire-multi
 boot/vmlinuz-KVER-ipfire-multi
 etc/modprobe.d/framebuffer.conf
 etc/modprobe.d/ipv6.conf
-etc/modprobe.d/isdn.conf
 lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/build
 #lib/modules/KVER-ipfire-multi/kernel
@@ -501,8 +500,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/arch/arm/crypto/sha1-arm.ko
 #lib/modules/KVER-ipfire-multi/kernel/arch/arm/crypto/sha256-arm.ko
 #lib/modules/KVER-ipfire-multi/kernel/arch/arm/crypto/sha512-arm.ko
-#lib/modules/KVER-ipfire-multi/kernel/arch/arm/oprofile
-#lib/modules/KVER-ipfire-multi/kernel/arch/arm/oprofile/oprofile.ko
 #lib/modules/KVER-ipfire-multi/kernel/crypto
 #lib/modules/KVER-ipfire-multi/kernel/crypto/ansi_cprng.ko
 #lib/modules/KVER-ipfire-multi/kernel/crypto/anubis.ko
@@ -953,22 +950,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/serio/serio_raw.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/serio/sun4i-ps2.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/sparse-keymap.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/capi
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/capi/capi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/capi/capidrv.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/capi/kernelcapi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/divert
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/divert/dss1_divert.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax/hfc_usb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax/hisax.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax/hisax_st5481.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/i4l
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/i4l/isdn.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/i4l/isdnhdlc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-bd2802.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-blinkm.ko
@@ -1704,8 +1685,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/chelsio/cxgb4/cxgb4.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/chelsio/cxgb4vf
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/chelsio/libcxgb
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/chelsio/libcxgb/libcxgb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/cirrus
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/cirrus/cs89x0.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/cisco
@@ -2167,6 +2146,10 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/zydas/zd1201.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/zydas/zd1211rw
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/zydas/zd1211rw/zd1211rw.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/nvme
+#lib/modules/KVER-ipfire-multi/kernel/drivers/nvme/host
+#lib/modules/KVER-ipfire-multi/kernel/drivers/nvme/host/nvme-core.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/nvme/host/nvme.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/parport
 #lib/modules/KVER-ipfire-multi/kernel/drivers/parport/parport.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/phy
@@ -2231,112 +2214,30 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-v3020.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-x1205.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/3w-9xxx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/3w-sas.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/3w-xxxx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/a100u2w.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/aacraid
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/aacraid/aacraid.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/advansys.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/aic7xxx
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/aic7xxx/aic79xx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/aic7xxx/aic7xxx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/aic94xx
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/aic94xx/aic94xx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/am53c974.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/arcmsr
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/arcmsr/arcmsr.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/atp870u.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/be2iscsi
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/be2iscsi/be2iscsi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/bnx2fc
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/bnx2fc/bnx2fc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/bnx2i
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/bnx2i/bnx2i.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ch.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/csiostor
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/csiostor/csiostor.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/cxgbi
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/cxgbi/cxgb3i
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/cxgbi/cxgb3i/cxgb3i.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/cxgbi/cxgb4i
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/cxgbi/cxgb4i/cxgb4i.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/cxgbi/libcxgbi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/dc395x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/device_handler
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/device_handler/scsi_dh_alua.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/device_handler/scsi_dh_emc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/device_handler/scsi_dh_hp_sw.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/device_handler/scsi_dh_rdac.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/dmx3191d.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/esas2r
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/esas2r/esas2r.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/esp_scsi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/fcoe
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/fcoe/fcoe.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/fcoe/libfcoe.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/fdomain.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/hpsa.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/hptiop.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/initio.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ipr.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ips.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/iscsi_boot_sysfs.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/iscsi_tcp.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/libfc
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/libfc/libfc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/libiscsi.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/libiscsi_tcp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/libsas
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/libsas/libsas.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/lpfc
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/lpfc/lpfc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/megaraid
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/megaraid.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/megaraid/megaraid_sas.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mpt3sas
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mpt3sas/mpt3sas.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mvsas
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mvsas/mvsas.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mvumi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/nsp32.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/osd
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/osd/libosd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/osd/osd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/osst.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/pm8001
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/pm8001/pm80xx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/pmcraid.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/qla1280.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/qla2xxx
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/qla2xxx/qla2xxx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/qla4xxx
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/qla4xxx/qla4xxx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/raid_class.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/scsi_debug.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/scsi_transport_fc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/scsi_transport_iscsi.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/scsi_transport_sas.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/scsi_transport_spi.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/scsi_transport_srp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ses.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/smartpqi
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/smartpqi/smartpqi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/snic
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/snic/snic.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/st.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/stex.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/sym53c8xx_2
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/sym53c8xx_2/sym53c8xx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs/tc-dwc-g210-pci.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs/tc-dwc-g210-pltfrm.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs/tc-dwc-g210.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs/ufshcd-dwc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs/ufshcd-pci.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs/ufshcd-pltfrm.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs/ufshcd.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/wd719x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ssb
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ssb/ssb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/staging
@@ -2684,8 +2585,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/bluetooth.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/bnep
 #lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/bnep/bnep.ko
-#lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/cmtp
-#lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/cmtp/cmtp.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/hidp
 #lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/hidp/hidp.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/bluetooth/rfcomm
@@ -2958,7 +2857,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/net/netfilter/nft_set_bitmap.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/netfilter/nft_set_hash.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/netfilter/nft_set_rbtree.ko
-#lib/modules/KVER-ipfire-multi/kernel/net/netfilter/xt_AUDIT.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/netfilter/xt_CHECKSUM.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/netfilter/xt_CLASSIFY.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/netfilter/xt_CONNSECMARK.ko
@@ -3165,10 +3063,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/sound/drivers/snd-virmidi.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/drivers/vx
 #lib/modules/KVER-ipfire-multi/kernel/sound/drivers/vx/snd-vx-lib.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/firewire
-#lib/modules/KVER-ipfire-multi/kernel/sound/firewire/dice
-#lib/modules/KVER-ipfire-multi/kernel/sound/firewire/dice/snd-dice.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/firewire/snd-firewire-lib.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/hda
 #lib/modules/KVER-ipfire-multi/kernel/sound/hda/snd-hda-core.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/i2c
@@ -3317,6 +3211,8 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/sound/usb
 #lib/modules/KVER-ipfire-multi/kernel/sound/usb/6fire
 #lib/modules/KVER-ipfire-multi/kernel/sound/usb/6fire/snd-usb-6fire.ko
+#lib/modules/KVER-ipfire-multi/kernel/sound/usb/bcd2000
+#lib/modules/KVER-ipfire-multi/kernel/sound/usb/bcd2000/snd-bcd2000.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/usb/caiaq
 #lib/modules/KVER-ipfire-multi/kernel/sound/usb/caiaq/snd-usb-caiaq.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/usb/hiface

diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index eff8339636718e1cf194f997e18d5006ac5208e0..43a81037db00de4ff601c7800cd6b170be7e350d 100644 (file)
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -3,7 +3,6 @@ boot/config-KVER-ipfire
 boot/vmlinuz-KVER-ipfire
 etc/modprobe.d/framebuffer.conf
 etc/modprobe.d/ipv6.conf
-etc/modprobe.d/isdn.conf
 lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/build
 #lib/modules/KVER-ipfire/kernel
@@ -682,59 +681,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/input/serio/ps2-gpio.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/serio/serio_raw.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/sparse-keymap.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/capi
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/capi/capi.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/capi/capidrv.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/capi/kernelcapi.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/divert
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/divert/dss1_divert.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/bas_gigaset.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/gigaset.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/ser_gigaset.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/usb_gigaset.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/b1.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/b1dma.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/b1pci.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/c4.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/t1pci.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/diva_idi.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/diva_mnt.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divacapi.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divadidd.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divas.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/netjet.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/w6692.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hfc_usb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax_fcpcipnp.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax_isac.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax_st5481.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hysdn
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hysdn/hysdn.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdn.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdnhdlc.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/l1oip.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_core.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds
 #lib/modules/KVER-ipfire/kernel/drivers/leds/led-class-flash.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds/leds-bd2802.ko
@@ -2845,8 +2791,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/bluetooth.ko
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep/bnep.ko
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/cmtp
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp/hidp.ko
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/rfcomm
@@ -3117,7 +3061,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nft_set_bitmap.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nft_set_hash.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nft_set_rbtree.ko
-#lib/modules/KVER-ipfire/kernel/net/netfilter/xt_AUDIT.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_CHECKSUM.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_CLASSIFY.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_CONNSECMARK.ko
@@ -3564,4 +3507,3 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/modules.symbols.bin
 #lib/modules/KVER-ipfire/source
 sbin/gen_init_cpio
-boot/initramfs-KVER-ipfire.img

diff --git a/config/rootfiles/common/i586/linux-initrd b/config/rootfiles/common/i586/linux-initrd
index 567955063b3c1650dc7c8d2b9b0fd680914b8b20..bc0915efba93d138016faf1fd61e7bbe9b2c3efd 100644 (file)
--- a/config/rootfiles/common/i586/linux-initrd
+++ b/config/rootfiles/common/i586/linux-initrd
@@ -1 +1 @@
-#boot/initramfs-KVER-ipfire.img
+boot/initramfs-KVER-ipfire.img

diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index ff081c513f6cd848e14bd7846d6a47d73e677f07..d7d070862315ff89d90721d065b35adfbb7884ce 100644 (file)
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -3,7 +3,6 @@ boot/config-KVER-ipfire
 boot/vmlinuz-KVER-ipfire
 etc/modprobe.d/framebuffer.conf
 etc/modprobe.d/ipv6.conf
-etc/modprobe.d/isdn.conf
 #lib/modules
 lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/build
@@ -697,59 +696,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/input/serio/ps2-gpio.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/serio/serio_raw.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/sparse-keymap.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/capi
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/capi/capi.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/capi/capidrv.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/capi/kernelcapi.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/divert
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/divert/dss1_divert.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/bas_gigaset.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/gigaset.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/ser_gigaset.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/usb_gigaset.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/b1.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/b1dma.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/b1pci.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/c4.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/t1pci.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/diva_idi.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/diva_mnt.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divacapi.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divadidd.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divas.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/netjet.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/w6692.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hfc_usb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax_fcpcipnp.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax_isac.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax_st5481.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hysdn
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hysdn/hysdn.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdn.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdnhdlc.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/l1oip.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_core.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds
 #lib/modules/KVER-ipfire/kernel/drivers/leds/leds-bd2802.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds/leds-blinkm.ko
@@ -2825,8 +2771,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/bluetooth.ko
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep/bnep.ko
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/cmtp
-#lib/modules/KVER-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp/hidp.ko
 #lib/modules/KVER-ipfire/kernel/net/bluetooth/rfcomm
@@ -3094,7 +3038,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nft_set_bitmap.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nft_set_hash.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nft_set_rbtree.ko
-#lib/modules/KVER-ipfire/kernel/net/netfilter/xt_AUDIT.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_CHECKSUM.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_CLASSIFY.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_CONNSECMARK.ko

diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index eb30f6150cdbba6c8bed756a014073d659e526c1..2b708f58c52bd99920017c6947e867d1f760c6f2 100644 (file)
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -681,59 +681,6 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/drivers/input/serio/ps2-gpio.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/input/serio/serio_raw.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/input/sparse-keymap.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/capi
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/capi/capi.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/capi/capidrv.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/capi/kernelcapi.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/divert
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/divert/dss1_divert.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/gigaset
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/gigaset/bas_gigaset.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/gigaset/gigaset.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/gigaset/ser_gigaset.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/gigaset/usb_gigaset.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/b1.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/b1dma.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/b1pci.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/c4.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/t1pci.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon/diva_idi.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon/diva_mnt.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon/divacapi.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon/divadidd.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon/divas.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN/netjet.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/mISDN/w6692.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hfc_usb.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hisax.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hisax_fcpcipnp.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hisax_isac.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hisax_st5481.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hysdn
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hysdn/hysdn.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/i4l
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/i4l/isdn.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/i4l/isdnhdlc.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/mISDN
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/mISDN/l1oip.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/mISDN/mISDN_core.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/leds
 #lib/modules/KVER-ipfire-pae/kernel/drivers/leds/led-class-flash.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-as3645a.ko
@@ -2860,8 +2807,6 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/bluetooth.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/bnep
 #lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/bnep/bnep.ko
-#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/cmtp
-#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/cmtp/cmtp.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/hidp
 #lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/hidp/hidp.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/rfcomm
@@ -3132,7 +3077,6 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nft_set_bitmap.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nft_set_hash.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nft_set_rbtree.ko
-#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_AUDIT.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_CHECKSUM.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_CLASSIFY.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_CONNSECMARK.ko

diff --git a/lfs/linux b/lfs/linux
index 5bd01ecbad6c3429bf6b249e75e78a8b1a0bff7a..eade900f3d8fd32e9ea8f4bdcb06bd35b2d3fd77 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -127,10 +127,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 #      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-rt2x00usb_suppress_queue_warnings.patch
 #      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-add_libertas_uap.patch
 
-       # mISDN Patches
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
-
        # Add LED trigger
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.16-ledtrig_netdev.patch
 
@@ -217,12 +213,6 @@ ifeq "$(LASTKERNEL)" "1"
        done    
        sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf
 
-       # Blacklist isdn modules
-       for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
-               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn.conf ; \
-       done
-       sed -i -e "s|.ko||g" /etc/modprobe.d/isdn.conf
-
        # Disable ipv6 at runtime
        echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf
 endif

diff --git a/src/patches/mISDN-hfcusb-reportl1down.patch b/src/patches/mISDN-hfcusb-reportl1down.patch
deleted file mode 100644 (file)
index 7db8c9a..0000000
--- a/src/patches/mISDN-hfcusb-reportl1down.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mISDN.org/drivers/isdn/hardware/mISDN/hfcsusb.c mISDN/drivers/isdn/hardware/mISDN/hfcsusb.c
---- mISDN.org/drivers/isdn/hardware/mISDN/hfcsusb.c    2009-09-06 17:02:14.000000000 +0200
-+++ mISDN/drivers/isdn/hardware/mISDN/hfcsusb.c        2010-02-06 17:44:22.000000000 +0100
-@@ -654,6 +654,8 @@
-       case (1):
-               test_and_clear_bit(FLG_ACTIVE, &dch->Flags);
-               test_and_clear_bit(FLG_L2_ACTIVATED, &dch->Flags);
-+              _queue_data(&dch->dev.D, PH_DEACTIVATE_IND,
-+                      MISDN_ID_ANY, 0, NULL, GFP_ATOMIC);
-               hw->nt_timer = 0;
-               hw->timers &= ~NT_ACTIVATION_TIMER;
-               handle_led(hw, LED_S0_OFF);

diff --git a/src/patches/mISDN_hfc-s_add_id.patch b/src/patches/mISDN_hfc-s_add_id.patch
deleted file mode 100644 (file)
index 724b1f2..0000000
--- a/src/patches/mISDN_hfc-s_add_id.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c mISDN/drivers/isdn/hardware/mISDN/hfcpci.c
---- mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c     2012-10-08 14:48:40.000000000 +0200
-+++ mISDN/drivers/isdn/hardware/mISDN/hfcpci.c 2012-10-08 17:09:29.527792226 +0200
-@@ -53,6 +53,8 @@
- 
- #include "hfc_pci.h"
- 
-+#define       PCI_VENDOR_ID_0x1AE7    0x1AE7
-+
- static const char *hfcpci_revision = "2.0";
- 
- static int HFC_cnt;
-@@ -90,6 +92,7 @@
-       HFC_DIGI_DF_M_A,
-       HFC_ABOCOM_2BD1,
-       HFC_SITECOM_DC105V2,
-+      HFC_NONAME_1AE7_0520,
- };
- 
- struct hfcPCI_hw {
-@@ -2161,6 +2164,7 @@
-       {HFC_DIGI_DF_M_A, 0,
-        "Digi International DataFire Micro V (North America)"},
-       {HFC_SITECOM_DC105V2, 0, "Sitecom Connectivity DC-105 ISDN TA"},
-+      {HFC_NONAME_1AE7_0520, 0, "NoName HFC-S (1AE7:0520) ISDN TA"},
-       {},
- };
- 
-@@ -2212,6 +2216,8 @@
-         (unsigned long) &hfc_map[21] },
-       { PCI_VDEVICE(SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2),
-         (unsigned long) &hfc_map[22] },
-+      { PCI_VDEVICE(0x1AE7, 0x0520),
-+        (unsigned long) &hfc_map[23] },
-       {},
- };
-