Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4acbab84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 78ae87c3 899b69d0

drivers/ata/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/video/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -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