summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2012-03-13 18:36:15 -0400
committerAdam Jackson <ajax@redhat.com>2012-03-13 18:36:15 -0400
commit3fade932efae82c0ebd81a93aeaffd4e63640736 (patch)
tree365ca7854e6208d4be6feb1dc90df8507cc3d3b7
parentcbca35e71ed553f331a7eaa1525dad1dbe2a4904 (diff)
alpine: Fix int10 setup
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>
-rw-r--r--src/alp_driver.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/alp_driver.c b/src/alp_driver.c
index 11cd2f2..2e19461 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -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;