Commit 8dc70acb authored by Keith Packard's avatar Keith Packard
Browse files

Merge remote-tracking branch 'alanc/master'

parents ffb47a12 b59adc9c
......@@ -74,8 +74,9 @@ _DMXXineramaActive(void)
{
#ifdef PANORAMIX
return !noPanoramiXExtension;
#endif
#else
return 0;
#endif
}
static void
......
......@@ -119,6 +119,23 @@ extern _X_EXPORT unsigned int inb(unsigned long);
extern _X_EXPORT unsigned int inw(unsigned long);
extern _X_EXPORT unsigned int inl(unsigned long);
#ifdef __SUNPRO_C
extern _X_EXPORT unsigned char xf86ReadMmio8 (void *, unsigned long);
extern _X_EXPORT unsigned short xf86ReadMmio16Be (void *, unsigned long);
extern _X_EXPORT unsigned short xf86ReadMmio16Le (void *, unsigned long);
extern _X_EXPORT unsigned int xf86ReadMmio32Be (void *, unsigned long);
extern _X_EXPORT unsigned int xf86ReadMmio32Le (void *, unsigned long);
extern _X_EXPORT void xf86WriteMmio8 (void *, unsigned long, unsigned int);
extern _X_EXPORT void xf86WriteMmio16Be (void *, unsigned long, unsigned int);
extern _X_EXPORT void xf86WriteMmio16Le (void *, unsigned long, unsigned int);
extern _X_EXPORT void xf86WriteMmio32Be (void *, unsigned long, unsigned int);
extern _X_EXPORT void xf86WriteMmio32Le (void *, unsigned long, unsigned int);
extern _X_EXPORT void xf86WriteMmio8NB (void *, unsigned long, unsigned int);
extern _X_EXPORT void xf86WriteMmio16BeNB (void *, unsigned long, unsigned int);
extern _X_EXPORT void xf86WriteMmio16LeNB (void *, unsigned long, unsigned int);
extern _X_EXPORT void xf86WriteMmio32BeNB (void *, unsigned long, unsigned int);
extern _X_EXPORT void xf86WriteMmio32LeNB (void *, unsigned long, unsigned int);
#endif /* _SUNPRO_C */
#endif /* __sparc__, __arm32__, __alpha__, __nds32__ */
#endif /* __arm__ */
......
......@@ -143,7 +143,7 @@ fbdevHWSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
}
void
fbdevHWAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int flags)
fbdevHWAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
{
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment