Code Review
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[linux-2.6.git]
/
drivers
/
scsi
/
Kconfig
diff --git
a/drivers/scsi/Kconfig
b/drivers/scsi/Kconfig
index d243ae1152097ecdec6bf8a8b8ed1376c5e4fd21..58c811d20eb2ba1f2dd608fd976a2e6242fbbea8 100644
(file)
--- a/
drivers/scsi/Kconfig
+++ b/
drivers/scsi/Kconfig
@@
-1639,7
+1639,7
@@
config OKTAGON_SCSI
config ATARI_SCSI
tristate "Atari native SCSI support"
config ATARI_SCSI
tristate "Atari native SCSI support"
- depends on ATARI && SCSI
&& BROKEN
+ depends on ATARI && SCSI
select SCSI_SPI_ATTRS
---help---
If you have an Atari with built-in NCR5380 SCSI controller (TT,
select SCSI_SPI_ATTRS
---help---
If you have an Atari with built-in NCR5380 SCSI controller (TT,
@@
-1753,9
+1753,15
@@
config SUN3X_ESP
The ESP was an on-board SCSI controller used on Sun 3/80
machines. Say Y here to compile in support for it.
The ESP was an on-board SCSI controller used on Sun 3/80
machines. Say Y here to compile in support for it.
+config SCSI_ESP_CORE
+ tristate "ESP Scsi Driver Core"
+ depends on SCSI
+ select SCSI_SPI_ATTRS
+
config SCSI_SUNESP
tristate "Sparc ESP Scsi Driver"
depends on SBUS && SCSI
config SCSI_SUNESP
tristate "Sparc ESP Scsi Driver"
depends on SBUS && SCSI
+ select SCSI_ESP_CORE
help
This is the driver for the Sun ESP SCSI host adapter. The ESP
chipset is present in most SPARC SBUS-based computers.
help
This is the driver for the Sun ESP SCSI host adapter. The ESP
chipset is present in most SPARC SBUS-based computers.