diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 16:25:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 16:25:59 -0400 |
| commit | 4acbab84688bfea82322c14e809fc7d82242cee3 (patch) | |
| tree | 7c4a9c0a088a70799d744d30e7c6a3220701adbb /drivers/ata | |
| parent | 78ae87c3cd723c8a8dcd67d4e4cbc6d63671c108 (diff) | |
| parent | 899b69d079713d0f568fb2700b86987aa94f29b2 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[ATA]: Don't allow to enable this for SPARC64 without PCI.
[VIDEO]: XVR500 and XVR2500 require FB=y
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index b4a8d6030e48..7d893a60f994 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -8,6 +8,7 @@ menuconfig ATA | |||
| 8 | depends on BLOCK | 8 | depends on BLOCK |
| 9 | depends on !(M32R || M68K) || BROKEN | 9 | depends on !(M32R || M68K) || BROKEN |
| 10 | depends on !SUN4 || BROKEN | 10 | depends on !SUN4 || BROKEN |
| 11 | depends on !(SPARC64 && !PCI) | ||
| 11 | select SCSI | 12 | select SCSI |
| 12 | ---help--- | 13 | ---help--- |
| 13 | If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or | 14 | If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or |