--- src/apm_driver.c.orig 2012-01-14 03:07:22.000000000 +0900 +++ src/apm_driver.c 2012-01-14 03:10:39.000000000 +0900 @@ -776,7 +776,9 @@ xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte\n", pScrn->videoRam); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (!xf86IsPc98()) { +#endif hwp->MapSize = 0x10000; vgaHWMapMem(pScrn); if (pApm->I2C) { @@ -794,7 +796,9 @@ xf86SetDDCproperties(pScrn, MonInfo); } pScrn->monitor->DDC = MonInfo; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 } +#endif /* The gamma fields must be initialised when using the new cmap code */ if (pScrn->depth > 1) { @@ -1378,8 +1382,10 @@ hwp->writeMiscOut(hwp, pApm->MiscOut | 0x0F); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (xf86IsPc98()) outb(0xFAC, 0xFF); +#endif memcpy(ApmReg, &pApm->SavedReg, sizeof pApm->SavedReg); @@ -1973,8 +1979,10 @@ } WRXB(0xC9, pApm->c9); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (xf86IsPc98()) outb(0xFAC, 0xFE); +#endif } /* @@ -2010,8 +2018,10 @@ pScrn->vtSema = FALSE; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (xf86IsPc98()) outb(0xFAC, 0xFE); +#endif pScreen->CloseScreen = pApm->CloseScreen; return (*pScreen->CloseScreen)(scrnIndex, pScreen);