diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:31:36 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:31:36 +0000 |
| commit | 1e80fe1bf94d36217c89f71b03dd7d22f156bc22 (patch) | |
| tree | 0f0ab23d685e4c24de5286a9c7db849133650830 | |
| parent | 5d8a0a2e47a5b6e304eea259de0b7d50af96c573 (diff) | |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
| -rw-r--r-- | man/fbdev.man | 11 | ||||
| -rw-r--r-- | src/fbdev.c | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/man/fbdev.man b/man/fbdev.man index f6a6f7d..ea5b730 100644 --- a/man/fbdev.man +++ b/man/fbdev.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man,v 1.3 2001/10/02 15:57:32 alanh Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH FBDEV __drivermansuffix__ __vendorversion__ @@ -15,7 +15,7 @@ fbdev \- video driver for framebuffer device .fi .SH DESCRIPTION .B fbdev -is an XFree86 driver for framebuffer devices. This is a non-accelerated +is an __xservername__ driver for framebuffer devices. This is a non-accelerated driver, the following framebuffer depths are supported: 8, 15, 16, 24. All visual types are supported for depth 8, and TrueColor visual is supported for the other depths. Multi-head configurations are supported. @@ -27,7 +27,7 @@ fbdev uses the os-specific submodule fbdevhw(__drivermansuffix__) to talk to the kernel device driver. Currently a fbdevhw module is available for linux. .SH CONFIGURATION DETAILS -Please refer to XF86Config(__filemansuffix__) for general configuration +Please refer to __xconfigfile__(__filemansuffix__) for general configuration details. This section only covers configuration details specific to this driver. .PP @@ -38,7 +38,8 @@ driver can pick up the currently used video mode from the framebuffer driver and will use it if there are no video modes configured. .PP For PCI boards you might have to add a BusID line to the Device -section. See above for a sample line. You can use "XFree86 -scanpci" +section. See above for a sample line. You can use \*q\__xservername__ +-scanpci\*q to figure out the correct values. .PP The following driver @@ -56,7 +57,7 @@ Enable rotation of the display. The supported values are "CW" (clockwise, 90 degrees), "UD" (upside down, 180 degrees) and "CCW" (counter clockwise, 270 degrees). Implies use of the shadow framebuffer layer. Default: off. .SH "SEE ALSO" -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), fbdevhw(__drivermansuffix__) .SH AUTHORS Authors include: Gerd Knorr, Michel Dänzer, Geert Uytterhoeven diff --git a/src/fbdev.c b/src/fbdev.c index 2553fff..a908ca5 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.45 2004/01/11 18:42:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.44 2003/09/24 02:43:21 dawes Exp $ */ /* * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> @@ -186,7 +186,7 @@ static XF86ModuleVersionInfo FBDevVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, FBDEV_MAJOR_VERSION, FBDEV_MINOR_VERSION, 0, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, |