tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 4acbab84 78ae87c3

+4 -3
unified split
+1
drivers/ata/Kconfig
··· 8 depends on BLOCK 9 depends on !(M32R || M68K) || BROKEN 10 depends on !SUN4 || BROKEN 11 select SCSI 12 ---help--- 13 If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
··· 8 depends on BLOCK 9 depends on !(M32R || M68K) || BROKEN 10 depends on !SUN4 || BROKEN 11 + depends on !(SPARC64 && !PCI) 12 select SCSI 13 ---help--- 14 If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
+3 -3
drivers/video/Kconfig
··· 755 756 config FB_IGA 757 bool "IGA 168x display support" 758 - depends on FB && SPARC32 759 select FB_CFB_FILLRECT 760 select FB_CFB_COPYAREA 761 select FB_CFB_IMAGEBLIT ··· 765 766 config FB_XVR500 767 bool "Sun XVR-500 3DLABS Wildcat support" 768 - depends on FB && PCI && SPARC64 769 select FB_CFB_FILLRECT 770 select FB_CFB_COPYAREA 771 select FB_CFB_IMAGEBLIT ··· 778 779 config FB_XVR2500 780 bool "Sun XVR-2500 3DLABS Wildcat support" 781 - depends on FB && PCI && SPARC64 782 select FB_CFB_FILLRECT 783 select FB_CFB_COPYAREA 784 select FB_CFB_IMAGEBLIT
··· 755 756 config FB_IGA 757 bool "IGA 168x display support" 758 + depends on (FB = y) && SPARC32 759 select FB_CFB_FILLRECT 760 select FB_CFB_COPYAREA 761 select FB_CFB_IMAGEBLIT ··· 765 766 config FB_XVR500 767 bool "Sun XVR-500 3DLABS Wildcat support" 768 + depends on (FB = y) && PCI && SPARC64 769 select FB_CFB_FILLRECT 770 select FB_CFB_COPYAREA 771 select FB_CFB_IMAGEBLIT ··· 778 779 config FB_XVR2500 780 bool "Sun XVR-2500 3DLABS Wildcat support" 781 + depends on (FB = y) && PCI && SPARC64 782 select FB_CFB_FILLRECT 783 select FB_CFB_COPYAREA 784 select FB_CFB_IMAGEBLIT