diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-07 22:31:25 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-07 22:31:25 -0300 |
| commit | 9f7fb9c12e84f20cd108b933f1a51e216f76cd98 (patch) | |
| tree | 06520d9024b40745b94f02d0d3419386e6496863 /extra/xf86-video-apm/apm-1.2.3-git.patch | |
| parent | 6cc893589a6bd208f2b7711f985e17df7a6df816 (diff) | |
| parent | a86ff663185661ee304bb1f6d00d982102dd706d (diff) | |
Merge branch 'master' of gparabola:abslibre-mips64el
Diffstat (limited to 'extra/xf86-video-apm/apm-1.2.3-git.patch')
| -rw-r--r-- | extra/xf86-video-apm/apm-1.2.3-git.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/extra/xf86-video-apm/apm-1.2.3-git.patch b/extra/xf86-video-apm/apm-1.2.3-git.patch deleted file mode 100644 index 1c6afb29d..000000000 --- a/extra/xf86-video-apm/apm-1.2.3-git.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/apm.h b/src/apm.h -index bc66714..86c7663 100644 ---- a/src/apm.h -+++ b/src/apm.h -@@ -109,7 +109,7 @@ typedef struct { - char *MemMap; - pointer BltMap; - Bool UnlockCalled; -- IOADDRESS iobase, xport, xbase; -+ unsigned long iobase, xport, xbase; - unsigned char savedSR10; - CARD8 MiscOut; - CARD8 c9, d9, db, Rush; -diff --git a/src/apm_driver.c b/src/apm_driver.c -index f172bab..f77bb2b 100644 ---- a/src/apm_driver.c -+++ b/src/apm_driver.c -@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) - - hwp = VGAHWPTR(pScrn); - vgaHWGetIOBase(hwp); -- pApm->iobase = hwp->PIOOffset; -- pApm->xport = hwp->PIOOffset + 0x3C4; -+#if ABI_VIDEODRV_VERSION < 12 -+#define PIOOFFSET hwp->PIOOffset -+#else -+/* FIXME reintroduce domain support */ -+#define PIOOFFSET 0 -+#endif -+ pApm->iobase = PIOOFFSET; -+ pApm->xport = PIOOFFSET + 0x3C4; - - /* Set pScrn->monitor */ - pScrn->monitor = pScrn->confScreen->monitor; |