projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'block-5.12-2021-02-27' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
drivers
/
block
/
Kconfig
diff --git
a/drivers/block/Kconfig
b/drivers/block/Kconfig
index
583b671
..
fd23615
100644
(file)
--- a/
drivers/block/Kconfig
+++ b/
drivers/block/Kconfig
@@
-66,6
+66,12
@@
config AMIGA_Z2RAM
To compile this driver as a module, choose M here: the
module will be called z2ram.
To compile this driver as a module, choose M here: the
module will be called z2ram.
+config N64CART
+ bool "N64 cart support"
+ depends on MACH_NINTENDO64
+ help
+ Support for the N64 cart.
+
config CDROM
tristate
select BLK_SCSI_REQUEST
config CDROM
tristate
select BLK_SCSI_REQUEST
@@
-267,16
+273,6
@@
config BLK_DEV_NBD
If unsure, say N.
If unsure, say N.
-config BLK_DEV_SKD
- tristate "STEC S1120 Block Driver"
- depends on PCI
- depends on 64BIT
- help
- Saying Y or M here will enable support for the
- STEC, Inc. S1120 PCIe SSD.
-
- Use device /dev/skd$N amd /dev/skd$Np$M.
-
config BLK_DEV_SX8
tristate "Promise SATA SX8 support"
depends on PCI
config BLK_DEV_SX8
tristate "Promise SATA SX8 support"
depends on PCI