From e11a6c236b3070ed05b079f91a9b3defa48b54d3 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 3 Jun 2007 17:35:24 -0700 Subject: [VIDEO]: XVR500 and XVR2500 require FB=y Signed-off-by: David S. Miller --- drivers/video/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 6e1f1ea..403dac7 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 -- cgit v1.1 From 899b69d079713d0f568fb2700b86987aa94f29b2 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 3 Jun 2007 17:39:56 -0700 Subject: [ATA]: Don't allow to enable this for SPARC64 without PCI. Based upon a report from Meelis Roos. Signed-off-by: David S. Miller --- drivers/ata/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index b4a8d60..7d893a6 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 -- cgit v1.1