KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xorg/nouveau: rename to nouveau2 

Signed-off-by: Marek Olšák <maraeo@gmail.com>
This commit is contained in:
Marcin Slusarz 2011-05-16 21:50:29 +02:00 committed by Marek Olšák
parent a97b40a886
commit c772d4e6f3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/targets/xorg-nouveau/Makefile
View File

@ -1,7 +1,7 @@
TOP = ../../../..
include $(TOP)/configs/current
LIBNAME = modesetting_drv.so
LIBNAME = nouveau2_drv.so
C_SOURCES = \
nouveau_target.c \

14
src/gallium/targets/xorg-nouveau/nouveau_xorg.c
View File

@ -54,7 +54,7 @@ static PciChipsets nouveau_xorg_pci_devices[] = {
};
static XF86ModuleVersionInfo nouveau_xorg_version = {
"modesetting",
"nouveau2",
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
@ -70,9 +70,9 @@ static XF86ModuleVersionInfo nouveau_xorg_version = {
* Xorg driver exported structures
*/
_X_EXPORT DriverRec modesetting = {
_X_EXPORT DriverRec nouveau2 = {
1,
"modesetting",
"nouveau2",
nouveau_xorg_identify,
NULL,
xorg_tracker_available_options,
@ -85,7 +85,7 @@ _X_EXPORT DriverRec modesetting = {
static MODULESETUPPROTO(nouveau_xorg_setup);
_X_EXPORT XF86ModuleData modesettingModuleData = {
_X_EXPORT XF86ModuleData nouveau2ModuleData = {
&nouveau_xorg_version,
nouveau_xorg_setup,
NULL
@ -104,7 +104,7 @@ nouveau_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)
*/
if (!setupDone) {
setupDone = 1;
xf86AddDriver(&modesetting, module, HaveDriverFuncs);
xf86AddDriver(&nouveau2, module, HaveDriverFuncs);
/*
* The return value must be non-NULL on success even though there
@ -121,7 +121,7 @@ nouveau_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)
static void
nouveau_xorg_identify(int flags)
{
xf86PrintChipsets("modesetting", "Driver for Modesetting Kernel Drivers",
xf86PrintChipsets("nouveau2", "Driver for Modesetting Kernel Drivers",
nouveau_xorg_chipsets);
}
@ -137,7 +137,7 @@ nouveau_xorg_pci_probe(DriverPtr driver,
if (scrn != NULL) {
scrn->driverVersion = 1;
scrn->driverName = "nouveau";
scrn->name = "modesetting";
scrn->name = "nouveau2";
scrn->Probe = NULL;
entity = xf86GetEntityInfo(entity_num);