Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56a68a50 authored by Adrian Bunk's avatar Adrian Bunk Committed by Jens Axboe
Browse files

more ACSI removal 



This patch removes some code that became dead code after the ATARI_ACSI
removal.

It also indirectly fixes the following bug introduced by
commit c2bcf3b8:

 config ATARI_SLM
        tristate "Atari SLM laser printer support"
-       depends on ATARI && ATARI_ACSI!=n
+       depends on ATARI

Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 5874c18b

Documentation/m68k/kernel-options.txt

+0 −7
Original line number Diff line number Diff line
@@ -82,13 +82,6 @@ Valid names are: 
  /dev/fd : -> 0x0200 (floppy disk)

  /dev/xda: -> 0x0c00 (first XT disk, unused in Linux/m68k)

  /dev/xdb: -> 0x0c40 (second XT disk, unused in Linux/m68k)

  /dev/ada: -> 0x1c00 (first ACSI device)

  /dev/adb: -> 0x1c10 (second ACSI device)

  /dev/adc: -> 0x1c20 (third ACSI device)

  /dev/add: -> 0x1c30 (forth ACSI device)



The last four names are available only if the kernel has been compiled

with Atari and ACSI support.



  The name must be followed by a decimal number, that stands for the

partition number. Internally, the value of the number is just

Documentation/networking/net-modules.txt

+0 −6
Original line number Diff line number Diff line
@@ -146,12 +146,6 @@ at1700.c: 
	irq = 0

	(Probes ports: 0x260, 0x280, 0x2A0, 0x240, 0x340, 0x320, 0x380, 0x300)



atari_bionet.c:

	Supports full autoprobing. (m68k/Atari)



atari_pamsnet.c:

	Supports full autoprobing. (m68k/Atari)



atarilance.c:

	Supports full autoprobing. (m68k/Atari)

drivers/block/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -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

drivers/block/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ obj-$(CONFIG_MAC_FLOPPY) += swim3.o 
obj-$(CONFIG_BLK_DEV_FD)	+= floppy.o

obj-$(CONFIG_AMIGA_FLOPPY)	+= amiflop.o

obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o

obj-$(CONFIG_ATARI_SLM)		+= acsi_slm.o

obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o

obj-$(CONFIG_BLK_DEV_RAM)	+= rd.o

obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o

drivers/block/acsi_slm.c

deleted100644 → 0
+0 −1032

File deleted.

Preview size limit exceeded, changes collapsed.