xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/solaris/sun_vid.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32e89ebaa96a7190734e8786e186c06b942ea631
Author: Andrea Monaco <andrea.monaco at autistici.org>
Date:   Wed Dec 15 13:12:10 2021 +0100

    hw/xfree86/os-support/solaris/sun_vid.c: Fix error message
    
    This is minor, but that error message says a wrong function name.
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index 2b48e66b0..8e94fcced 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -88,7 +88,7 @@ xf86EnableIO(void)
 {
 #if defined(__i386__) || defined(__i386) || defined(__x86)
     if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
-        xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");
+        xf86Msg(X_WARNING, "xf86EnableIO: Failed to set IOPL for I/O\n");
         return FALSE;
     }
 #endif                          /* i386 */