XLibre/xf86-video-cirrus
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-cirrus.git synced 2026-03-24 01:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

alpine: Fix int10 setup

Browse Source 
The PC98-removal fix accidentally took out the non-PC98 path here.

Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson
2012-03-13 18:36:15 -04:00
parent cbca35e71e
commit 3fade932ef
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/alp_driver.c
View File

@@ -534,7 +534,10 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
PCI_DEV_FUNC(pCir->PciInfo));
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
if (!xf86IsPc98() && xf86LoadSubModule(pScrn, "int10")) {
if (!xf86IsPc98())
#endif
if (xf86LoadSubModule(pScrn, "int10"))
{
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
pInt = xf86InitInt10(pCir->pEnt->index);
xf86FreeInt10(pInt);
@@ -546,7 +549,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM), 0x10);
PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM), 0x14);
}
#endif
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;