clean up a few obsoleted and duplicated config options (NFC)

29 files changed, 0 insertions, 175 deletions

diff --git a/configs/fedora/generic/CONFIG_IPX_INTERN b/configs/fedora/generic/CONFIG_IPX_INTERN
deleted file mode 100644
index d409381ce..000000000
--- a/configs/fedora/generic/CONFIG_IPX_INTERN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IPX_INTERN is not set
diff --git a/configs/fedora/generic/CONFIG_NCPFS_EXTRAS b/configs/fedora/generic/CONFIG_NCPFS_EXTRAS
deleted file mode 100644
index 53bf4bb9f..000000000
--- a/configs/fedora/generic/CONFIG_NCPFS_EXTRAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NCPFS_EXTRAS=y
diff --git a/configs/fedora/generic/CONFIG_NCPFS_IOCTL_LOCKING b/configs/fedora/generic/CONFIG_NCPFS_IOCTL_LOCKING
deleted file mode 100644
index 4d1f92783..000000000
--- a/configs/fedora/generic/CONFIG_NCPFS_IOCTL_LOCKING
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NCPFS_IOCTL_LOCKING=y
diff --git a/configs/fedora/generic/CONFIG_NCPFS_NFS_NS b/configs/fedora/generic/CONFIG_NCPFS_NFS_NS
deleted file mode 100644
index 5259e73e5..000000000
--- a/configs/fedora/generic/CONFIG_NCPFS_NFS_NS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NCPFS_NFS_NS=y
diff --git a/configs/fedora/generic/CONFIG_NCPFS_NLS b/configs/fedora/generic/CONFIG_NCPFS_NLS
deleted file mode 100644
index 61ae7e28e..000000000
--- a/configs/fedora/generic/CONFIG_NCPFS_NLS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NCPFS_NLS=y
diff --git a/configs/fedora/generic/CONFIG_NCPFS_OS2_NS b/configs/fedora/generic/CONFIG_NCPFS_OS2_NS
deleted file mode 100644
index dcc775a1d..000000000
--- a/configs/fedora/generic/CONFIG_NCPFS_OS2_NS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NCPFS_OS2_NS=y
diff --git a/configs/fedora/generic/CONFIG_NCPFS_PACKET_SIGNING b/configs/fedora/generic/CONFIG_NCPFS_PACKET_SIGNING
deleted file mode 100644
index 8a8915b01..000000000
--- a/configs/fedora/generic/CONFIG_NCPFS_PACKET_SIGNING
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NCPFS_PACKET_SIGNING=y
diff --git a/configs/fedora/generic/CONFIG_NCPFS_SMALLDOS b/configs/fedora/generic/CONFIG_NCPFS_SMALLDOS
deleted file mode 100644
index f66a269ec..000000000
--- a/configs/fedora/generic/CONFIG_NCPFS_SMALLDOS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NCPFS_SMALLDOS=y
diff --git a/configs/fedora/generic/CONFIG_NCPFS_STRONG b/configs/fedora/generic/CONFIG_NCPFS_STRONG
deleted file mode 100644
index 62ad205ea..000000000
--- a/configs/fedora/generic/CONFIG_NCPFS_STRONG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NCPFS_STRONG=y
diff --git a/configs/fedora/generic/arm/CONFIG_NCP_FS b/configs/fedora/generic/arm/CONFIG_NCP_FS
deleted file mode 100644
index 62eb3bdd0..000000000
--- a/configs/fedora/generic/arm/CONFIG_NCP_FS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NCP_FS is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SNI_AVE b/configs/fedora/generic/arm/aarch64/CONFIG_SNI_AVE
deleted file mode 100644
index d9f95b233..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SNI_AVE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SNI_AVE is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index b88cc823d..6d0d84b98 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2490,7 +2490,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3386,15 +3385,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 CONFIG_ND_BLK=m
 CONFIG_ND_BTT=m
 CONFIG_NE2K_PCI=m
@@ -5504,7 +5495,6 @@ CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
-# CONFIG_SNI_AVE is not set
 CONFIG_SNI_NETSEC=m
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SOC_CAMERA is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 495108ff7..9c24da5e6 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2471,7 +2471,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3363,15 +3362,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 CONFIG_ND_BLK=m
 CONFIG_ND_BTT=m
 CONFIG_NE2K_PCI=m
@@ -5479,7 +5470,6 @@ CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
-# CONFIG_SNI_AVE is not set
 CONFIG_SNI_NETSEC=m
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SOC_CAMERA is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index ad364c83e..f10f6d3e8 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2634,7 +2634,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3620,15 +3619,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 CONFIG_NEON=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 6368e9eda..73ecdc67b 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2503,7 +2503,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3444,15 +3443,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 CONFIG_NEON=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index b92421887..23ae0e427 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2484,7 +2484,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3421,15 +3420,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 CONFIG_NEON=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 136fb5dc0..72c250496 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2615,7 +2615,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3597,15 +3596,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 CONFIG_NEON=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 750533ca9..e4a7265bc 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2372,7 +2372,6 @@ CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3230,15 +3229,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET5501 is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 722883af9..d4c30b635 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2392,7 +2392,6 @@ CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3252,15 +3251,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET5501 is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 2a43b76ff..b5945b12a 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2392,7 +2392,6 @@ CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3252,15 +3251,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET5501 is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 4e0dc44e8..92284f85d 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2372,7 +2372,6 @@ CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3230,15 +3229,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET5501 is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 2ab0e470c..6852bef87 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2236,7 +2236,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3068,15 +3067,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET_9P_DEBUG is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 62ea123aa..123854959 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2216,7 +2216,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3044,15 +3043,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET_9P_DEBUG is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index eafd62233..eb735e217 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2181,7 +2181,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3012,15 +3011,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET_9P_DEBUG is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index ba6bc504b..b2c402afd 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2161,7 +2161,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -2988,15 +2987,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET_9P_DEBUG is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 5534cfb35..0ee5bf891 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2134,7 +2134,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -2949,15 +2948,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET_9P_DEBUG is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index b28666601..7f6620fb3 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2114,7 +2114,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -2925,15 +2924,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET_9P_DEBUG is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index eaba78ddc..2227f054f 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2449,7 +2449,6 @@ CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3295,15 +3294,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 CONFIG_ND_BLK=m
 CONFIG_ND_BTT=m
 CONFIG_ND_PFN=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 820969399..b5d2e3925 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2429,7 +2429,6 @@ CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
@@ -3273,15 +3272,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
 # CONFIG_NCP_FS is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_STRONG=y
 CONFIG_ND_BLK=m
 CONFIG_ND_BTT=m
 CONFIG_ND_PFN=m