mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-29 15:43:59 +08:00
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:
commit
4acbab8468
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user