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

1 files changed, 0 insertions, 11 deletions

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e49162b15578..c5a61571a076 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