diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 07:43:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 07:43:14 -0700 |
| commit | 92f53c6f1e47d92b40b1e9e1662b0056c783b962 (patch) | |
| tree | 850cba7afebec402f8db3fa6e9ea5199e858ffd7 /drivers/block/Kconfig | |
| parent | ff69c00f0a58383f1f60dd2756e54a857f08d249 (diff) | |
| parent | 40044ce0bf2b7e548584d91f108444e83ed5eab3 (diff) | |
| download | op-kernel-dev-92f53c6f1e47d92b40b1e9e1662b0056c783b962.zip op-kernel-dev-92f53c6f1e47d92b40b1e9e1662b0056c783b962.tar.gz | |
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
Diffstat (limited to 'drivers/block/Kconfig')
| -rw-r--r-- | drivers/block/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index b6d230b..0d1d213 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -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 |
