openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2007-06-04 13:25:59 -07:00
parent 78ae87c3cd 899b69d079
commit 4acbab8468
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/ata/Kconfig
View File

@ -8,6 +8,7 @@ menuconfig ATA
depends on BLOCK depends on BLOCK
depends on !(M32R || M68K) || BROKEN depends on !(M32R || M68K) || BROKEN
depends on !SUN4 || BROKEN depends on !SUN4 || BROKEN
depends on !(SPARC64 && !PCI)
select SCSI select SCSI
---help--- ---help---
If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or

6
drivers/video/Kconfig
View File

@ -755,7 +755,7 @@ config FB_LEO
config FB_IGA config FB_IGA
bool "IGA 168x display support" bool "IGA 168x display support"
depends on FB && SPARC32 depends on (FB = y) && SPARC32
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT select FB_CFB_IMAGEBLIT
@ -765,7 +765,7 @@ config FB_IGA
config FB_XVR500 config FB_XVR500
bool "Sun XVR-500 3DLABS Wildcat support" 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_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT select FB_CFB_IMAGEBLIT
@ -778,7 +778,7 @@ config FB_XVR500
config FB_XVR2500 config FB_XVR2500
bool "Sun XVR-2500 3DLABS Wildcat support" 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_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT select FB_CFB_IMAGEBLIT