summaryrefslogtreecommitdiff
path: root/hw/xfree86
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86')
-rw-r--r--hw/xfree86/drivers/modesetting/vblank.c2
-rw-r--r--hw/xfree86/parser/Monitor.c2
-rw-r--r--hw/xfree86/vbe/vbe.c2
-rw-r--r--hw/xfree86/x86emu/sys.c2
-rw-r--r--hw/xfree86/xorg-wrapper.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/hw/xfree86/drivers/modesetting/vblank.c b/hw/xfree86/drivers/modesetting/vblank.c
index 561229f30..d5799d526 100644
--- a/hw/xfree86/drivers/modesetting/vblank.c
+++ b/hw/xfree86/drivers/modesetting/vblank.c
@@ -307,7 +307,7 @@ ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint64_t sequence, Bool is64bit)
* but update the 32-bit tracking variables with reliable ground truth.
*
* With 64-Bit api in use, the only !is64bit input is from pageflip events,
- * and any pageflip event is usually preceeded by some is64bit input from
+ * and any pageflip event is usually preceded by some is64bit input from
* swap scheduling, so this should provide reliable mapping for pageflip
* events based on true 64-bit input as baseline as well.
*/
diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c
index a33c968bc..1d63a441c 100644
--- a/hw/xfree86/parser/Monitor.c
+++ b/hw/xfree86/parser/Monitor.c
@@ -381,7 +381,7 @@ xf86parseVerboseMode(void)
Error(UNEXPECTED_EOF_MSG);
break;
default:
- Error("Unexepcted token in verbose \"Mode\" entry\n");
+ Error("Unexpected token in verbose \"Mode\" entry\n");
}
}
if (!had_dotclock)
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index d23e0f589..a37975ddf 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -309,7 +309,7 @@ vbeReadEDID(vbeInfoPtr pVbe)
xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC read failed\n");
break;
default:
- xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC unkown failure %i\n",
+ xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC unknown failure %i\n",
pVbe->pInt10->ax & 0xff00);
break;
}
diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c
index ccce540e7..c9d463f3b 100644
--- a/hw/xfree86/x86emu/sys.c
+++ b/hw/xfree86/x86emu/sys.c
@@ -35,7 +35,7 @@
* Description: This file includes subroutines which are related to
* programmed I/O and memory access. Included in this module
* are default functions with limited usefulness. For real
-* uses these functions will most likely be overriden by the
+* uses these functions will most likely be overridden by the
* user library.
*
****************************************************************************/
diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
index c5e4a278b..6c1022358 100644
--- a/hw/xfree86/xorg-wrapper.c
+++ b/hw/xfree86/xorg-wrapper.c
@@ -231,7 +231,7 @@ int main(int argc, char *argv[])
}
#ifdef WITH_LIBDRM
- /* Detect if we need root rights, except when overriden by the config */
+ /* Detect if we need root rights, except when overridden by the config */
if (needs_root_rights == -1) {
for (i = 0; i < 16; i++) {
snprintf(buf, sizeof(buf), DRM_DEV_NAME, DRM_DIR_NAME, i);