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

Commit 92f53c6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "unexport bio_{,un}map_user"
  relay: fix subbuf_splice_actor() adding too many pages
  The ps2esdi driver was marked as BROKEN more than two years ago due to being
parents ff69c00f 40044ce0

Documentation/mca.txt

+5 −12
Original line number Original line Diff line number Diff line
@@ -143,14 +143,7 @@ MCA Device Drivers 




Currently, there are a number of MCA-specific device drivers.

Currently, there are a number of MCA-specific device drivers.





1) PS/2 ESDI

1) PS/2 SCSI

	drivers/block/ps2esdi.c

	include/linux/ps2esdi.h

   Uses major number 36, and should use /dev files /dev/eda, /dev/edb.

   Supports two drives, but only one controller.  May use the

   command-line args "ed=cyl,head,sec" and "tp720".



2) PS/2 SCSI

	drivers/scsi/ibmmca.c

	drivers/scsi/ibmmca.c

	drivers/scsi/ibmmca.h

	drivers/scsi/ibmmca.h

   The driver for the IBM SCSI subsystem.  Includes both integrated

   The driver for the IBM SCSI subsystem.  Includes both integrated
@@ -159,25 +152,25 @@ Currently, there are a number of MCA-specific device drivers. 
   machine with a front-panel display (i.e. model 95), you can use

   machine with a front-panel display (i.e. model 95), you can use

   "ibmmcascsi=display" to enable a drive activity indicator.

   "ibmmcascsi=display" to enable a drive activity indicator.





3) 3c523

2) 3c523

	drivers/net/3c523.c

	drivers/net/3c523.c

	drivers/net/3c523.h

	drivers/net/3c523.h

   3Com 3c523 Etherlink/MC ethernet driver.

   3Com 3c523 Etherlink/MC ethernet driver.





4) SMC Ultra/MCA and IBM Adapter/A

3) SMC Ultra/MCA and IBM Adapter/A

	drivers/net/smc-mca.c

	drivers/net/smc-mca.c

	drivers/net/smc-mca.h

	drivers/net/smc-mca.h

	Driver for the MCA version of the SMC Ultra and various other

	Driver for the MCA version of the SMC Ultra and various other

	OEM'ed and work-alike cards (Elite, Adapter/A, etc).

	OEM'ed and work-alike cards (Elite, Adapter/A, etc).





5) NE/2

4) NE/2

	driver/net/ne2.c

	driver/net/ne2.c

	driver/net/ne2.h

	driver/net/ne2.h

	The NE/2 is the MCA version of the NE2000.  This may not work

	The NE/2 is the MCA version of the NE2000.  This may not work

	with clones that have a different adapter id than the original

	with clones that have a different adapter id than the original

	NE/2.

	NE/2.





6) Future Domain MCS-600/700, OEM'd IBM Fast SCSI Adapter/A and

5) Future Domain MCS-600/700, OEM'd IBM Fast SCSI Adapter/A and

   Reply Sound Blaster/SCSI (SCSI part)

   Reply Sound Blaster/SCSI (SCSI part)

	Better support for these cards than the driver for ISA.

	Better support for these cards than the driver for ISA.

   Supports multiple cards with IRQ sharing.

   Supports multiple cards with IRQ sharing.

drivers/block/Kconfig

+0 −10
Original line number Original line Diff line number Diff line
@@ -44,16 +44,6 @@ config MAC_FLOPPY 
	  If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)

	  If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)

	  floppy controller, say Y here. Most commonly found in PowerMacs.

	  floppy controller, say Y here. Most commonly found in PowerMacs.





config BLK_DEV_PS2

	tristate "PS/2 ESDI hard disk support"

	depends on MCA && MCA_LEGACY && BROKEN

	help

	  Say Y here if you have a PS/2 machine with a MCA bus and an ESDI

	  hard disk.



	  To compile this driver as a module, choose M here: the

	  module will be called ps2esdi.



config AMIGA_Z2RAM

config AMIGA_Z2RAM

	tristate "Amiga Zorro II ramdisk support"

	tristate "Amiga Zorro II ramdisk support"

	depends on ZORRO

	depends on ZORRO

drivers/block/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o 
obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o

obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o

obj-$(CONFIG_BLK_DEV_RAM)	+= brd.o

obj-$(CONFIG_BLK_DEV_RAM)	+= brd.o

obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o

obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o

obj-$(CONFIG_BLK_DEV_PS2)	+= ps2esdi.o

obj-$(CONFIG_BLK_DEV_XD)	+= xd.o

obj-$(CONFIG_BLK_DEV_XD)	+= xd.o

obj-$(CONFIG_BLK_CPQ_DA)	+= cpqarray.o

obj-$(CONFIG_BLK_CPQ_DA)	+= cpqarray.o

obj-$(CONFIG_BLK_CPQ_CISS_DA)  += cciss.o

obj-$(CONFIG_BLK_CPQ_CISS_DA)  += cciss.o

drivers/block/ps2esdi.c

deleted100644 → 0
+0 −1079

File deleted.

Preview size limit exceeded, changes collapsed.

fs/bio.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1194,6 +1194,8 @@ EXPORT_SYMBOL(bio_hw_segments); 
EXPORT_SYMBOL(bio_add_page);

EXPORT_SYMBOL(bio_add_page);

EXPORT_SYMBOL(bio_add_pc_page);

EXPORT_SYMBOL(bio_add_pc_page);

EXPORT_SYMBOL(bio_get_nr_vecs);

EXPORT_SYMBOL(bio_get_nr_vecs);

EXPORT_SYMBOL(bio_map_user);

EXPORT_SYMBOL(bio_unmap_user);

EXPORT_SYMBOL(bio_map_kern);

EXPORT_SYMBOL(bio_map_kern);

EXPORT_SYMBOL(bio_pair_release);

EXPORT_SYMBOL(bio_pair_release);

EXPORT_SYMBOL(bio_split);

EXPORT_SYMBOL(bio_split);