kernel: Disable support for floppy drives and block ramdisks

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/config-generic b/kernel/config-generic
index 1a33fd4a2845ea7066b2600b43255dc7273a67ef..1d7d653955b5297f639ad35df8a409e6f4643394 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -1553,9 +1553,7 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_XEN_BLKDEV_FRONTEND=m

diff --git a/kernel/config-x86_64-generic b/kernel/config-x86_64-generic
index 2d560b92ca2fce4b0fb82ffa2571dd03dc574b6f..0b2901710e99483fcb4d333d9d2a53b3c7567503 100644 (file)
--- a/kernel/config-x86_64-generic
+++ b/kernel/config-x86_64-generic
@@ -383,8 +383,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 #
 # Protocols
 #
-CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_FD_RAWCMD is not set
+# CONFIG_BLK_DEV_FD is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 
 #

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 8018eb3393fecd8c30124ba6cedd30f1c2b8aa70..dca5e75e5aaf77c98f805c03356a6097112520cc 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 6.0.6
-release    = 0.57
+release    = 0.58
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>