svn merge ^/branches/released .

1 files changed, 5 insertions, 5 deletions

diff --git a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
index 0d457193a..9b26fb1dd 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
@@ -246,7 +246,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 			   "xf86MapVidMem", DEV_MEM, Size, Base, 

 			   strerror(errno));

 	    }

-	    return(base);

+	    return base;

 	}

 		

 	/* else, mmap /dev/vga */

@@ -266,7 +266,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 	    FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)",

 		       strerror(errno));

 	}

-	return(base);

+	return base;

 }

 

 static void

@@ -289,7 +289,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 

 	checkDevMem(TRUE);

 	if (devMemFd == -1) {

-	    return(-1);

+	    return -1;

 	}

 

 	psize = getpagesize();

@@ -308,7 +308,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 		    xf86Msg(X_WARNING, SYSCTL_MSG2);

 		} 

 #endif

-		return(-1);

+		return -1;

 	}

 #ifdef DEBUG

 	ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",

@@ -321,7 +321,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 		"-> %02x %02x %02x %02x...\n",

 		Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);

 #endif

-	return(Len);

+	return Len;

 }

 

 #ifdef USE_I386_IOPL