diff options
| -rw-r--r-- | doc/Xserver.man.pre | 4 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Module.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86PciInfo.h | 4 | ||||
| -rw-r--r-- | hw/xfree86/doc/man/xorg.conf.man.pre | 2 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/text-mode.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/Cards | 5 |
6 files changed, 14 insertions, 4 deletions
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre index b9597f15c..d65acde6a 100644 --- a/doc/Xserver.man.pre +++ b/doc/Xserver.man.pre @@ -181,7 +181,7 @@ prints a usage message. causes all remaining command line arguments to be ignored. .TP 8 .B \-maxbigreqsize \fIsize\fP -sets the maxmium big request to +sets the maximum big request to .I size MB. .TP 8 @@ -449,7 +449,7 @@ the text after the /; it is used to distinguish between instances of <action> ::= a | i | e -<string> ::= <dbl quoted string> | <single quoted string> | <unqouted string> +<string> ::= <dbl quoted string> | <single quoted string> | <unquoted string> <dbl quoted string> ::= <space> " <not dqoute>* " <space> diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index 3c3247e40..cf404fb89 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -85,7 +85,7 @@ typedef enum { */ #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 3) #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(1, 1) -#define ABI_XINPUT_VERSION SET_ABI_VERSION(1, 0) +#define ABI_XINPUT_VERSION SET_ABI_VERSION(0, 6) #define ABI_EXTENSION_VERSION SET_ABI_VERSION(0, 3) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 5) diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h index b8ba73f6a..0630cfa82 100644 --- a/hw/xfree86/common/xf86PciInfo.h +++ b/hw/xfree86/common/xf86PciInfo.h @@ -92,6 +92,7 @@ #define PCI_VENDOR_TRITECH 0x1292 #define PCI_VENDOR_NVIDIA_SGS 0x12D2 #define PCI_VENDOR_VMWARE 0x15AD +#define PCI_VENDOR_AST 0x1A03 #define PCI_VENDOR_3DLABS 0x3D3D #define PCI_VENDOR_AVANCE_2 0x4005 #define PCI_VENDOR_HERCULES 0x4843 @@ -358,6 +359,9 @@ #define PCI_CHIP_RS350_7834 0x7834 #define PCI_CHIP_RS350_7835 0x7835 +/* ASPEED Technology (AST) */ +#define PCI_CHIP_AST2000 0x2000 + /* Avance Logic */ #define PCI_CHIP_ALG2064 0x2064 #define PCI_CHIP_ALG2301 0x2301 diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index e94804c3b..abf31468a 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -1081,7 +1081,7 @@ Include the set of modes listed in the .B Modes section called .IR modesection-id. -This make all of the modes defined in that section available for use by +This makes all of the modes defined in that section available for use by this monitor. .TP 7 .BI "Mode \*q" name \*q diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 74647fdb7..04b0ce6cb 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -1116,6 +1116,7 @@ CardConfig(void) static char *xdrivers[] = { "apm", "ark", + "ast", "ati", "r128", "radeon", diff --git a/hw/xfree86/utils/xorgconfig/Cards b/hw/xfree86/utils/xorgconfig/Cards index bf30eab1d..b95928c37 100644 --- a/hw/xfree86/utils/xorgconfig/Cards +++ b/hw/xfree86/utils/xorgconfig/Cards @@ -51,6 +51,11 @@ NAME ** Ark Logic (generic) [ark] SERVER SVGA DRIVER ark +NAME ** ASPEED Technology (generic) [ast] +#CHIPSET ast +SERVER SVGA +DRIVER ast + NAME ** ATI (generic) [ati] #CHIPSET ati SERVER SVGA |