mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
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
This commit is contained in:
commit
92f53c6f1e
8 changed files with 10 additions and 1203 deletions
|
|
@ -44,16 +44,6 @@ config MAC_FLOPPY
|
|||
If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)
|
||||
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
|
||||
tristate "Amiga Zorro II ramdisk support"
|
||||
depends on ZORRO
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o
|
|||
obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o
|
||||
obj-$(CONFIG_BLK_DEV_RAM) += brd.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_CPQ_DA) += cpqarray.o
|
||||
obj-$(CONFIG_BLK_CPQ_CISS_DA) += cciss.o
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue