summaryrefslogtreecommitdiffstats
path: root/drivers/block/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 10:48:20 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 10:48:20 -0700
commit14dc5249728ff699b1ca4dac01ad416a350a147a (patch)
tree4ffd91101601f55c5e0b53a00f03534b7e044ac4 /drivers/block/Kconfig
parent02b2318e07f98a7cdf7089a4457a8d62424aa824 (diff)
parentbcd4f3acbaec102e2b8000c977ecc38dcd0fe367 (diff)
downloadop-kernel-dev-14dc5249728ff699b1ca4dac01ad416a350a147a.zip
op-kernel-dev-14dc5249728ff699b1ca4dac01ad416a350a147a.tar.gz
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block: splice: direct splicing updates ppos twice more ACSI removal umem: Fix match of pci_ids in umem driver umem: Remove references to dead CONFIG_MM_MAP_MEMORY variable remove the documentation for the legacy CDROM drivers
Diffstat (limited to 'drivers/block/Kconfig')
-rw-r--r--drivers/block/Kconfig11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e49162b..c5a6157 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -59,17 +59,6 @@ config AMIGA_Z2RAM
To compile this driver as a module, choose M here: the
module will be called z2ram.
-config ATARI_SLM
- tristate "Atari SLM laser printer support"
- depends on ATARI
- help
- If you have an Atari SLM laser printer, say Y to include support for
- it in the kernel. Otherwise, say N. This driver is also available as
- a module ( = code which can be inserted in and removed from the
- running kernel whenever you want). The module will be called
- acsi_slm. Be warned: the driver needs much ST-RAM and can cause
- problems due to that fact!
-
config BLK_DEV_XD
tristate "XT hard disk support"
depends on ISA && ISA_DMA_API
OpenPOWER on IntegriCloud