diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 13:25:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 13:25:59 -0700 |
| commit | 4acbab84688bfea82322c14e809fc7d82242cee3 (patch) | |
| tree | 7c4a9c0a088a70799d744d30e7c6a3220701adbb /drivers | |
| parent | 78ae87c3cd723c8a8dcd67d4e4cbc6d63671c108 (diff) | |
| parent | 899b69d079713d0f568fb2700b86987aa94f29b2 (diff) | |
| download | linux-4acbab84688bfea82322c14e809fc7d82242cee3.tar.gz linux-4acbab84688bfea82322c14e809fc7d82242cee3.tar.bz2 linux-4acbab84688bfea82322c14e809fc7d82242cee3.zip | |
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')
| -rw-r--r-- | drivers/ata/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 6 |
2 files changed, 4 insertions, 3 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 depends on BLOCK depends on !(M32R || M68K) || BROKEN depends on !SUN4 || BROKEN + depends on !(SPARC64 && !PCI) select SCSI ---help--- If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 6e1f1ea21b38..403dac787ebf 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -755,7 +755,7 @@ config FB_LEO config FB_IGA bool "IGA 168x display support" - depends on FB && SPARC32 + depends on (FB = y) && SPARC32 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT @@ -765,7 +765,7 @@ config FB_IGA config FB_XVR500 bool "Sun XVR-500 3DLABS Wildcat support" - depends on FB && PCI && SPARC64 + depends on (FB = y) && PCI && SPARC64 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT @@ -778,7 +778,7 @@ config FB_XVR500 config FB_XVR2500 bool "Sun XVR-2500 3DLABS Wildcat support" - depends on FB && PCI && SPARC64 + depends on (FB = y) && PCI && SPARC64 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT |