Merge tag 'ata-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[sfrench/cifs-2.6.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index a41145d52de9426b0b6c9ac0ba97c0f7e4c79b5d..f79f20430ef7a403a52d513f038316815a98b100 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -103,35 +103,6 @@ config GDROM
          Most users will want to say "Y" here.
          You can also build this as a module which will be called gdrom.
 
-config PARIDE
-       tristate "Parallel port IDE device support"
-       depends on PARPORT_PC
-       help
-         There are many external CD-ROM and disk devices that connect through
-         your computer's parallel port. Most of them are actually IDE devices
-         using a parallel port IDE adapter. This option enables the PARIDE
-         subsystem which contains drivers for many of these external drives.
-         Read <file:Documentation/admin-guide/blockdev/paride.rst> for more information.
-
-         If you have said Y to the "Parallel-port support" configuration
-         option, you may share a single port between your printer and other
-         parallel port devices. Answer Y to build PARIDE support into your
-         kernel, or M if you would like to build it as a loadable module. If
-         your parallel port support is in a loadable module, you must build
-         PARIDE as a module. If you built PARIDE support into your kernel,
-         you may still build the individual protocol modules and high-level
-         drivers as loadable modules. If you build this support as a module,
-         it will be called paride.
-
-         To use the PARIDE support, you must say Y or M here and also to at
-         least one high-level driver (e.g. "Parallel port IDE disks",
-         "Parallel port ATAPI CD-ROMs", "Parallel port ATAPI disks" etc.) and
-         to at least one protocol driver (e.g. "ATEN EH-100 protocol",
-         "MicroSolutions backpack protocol", "DataStor Commuter protocol"
-         etc.).
-
-source "drivers/block/paride/Kconfig"
-
 source "drivers/block/mtip32xx/Kconfig"
 
 source "drivers/block/zram/Kconfig"