diff options
| author | Alon Levy <alevy@redhat.com> | 2011-04-27 16:11:09 +0300 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-07-22 03:48:04 +0300 |
| commit | d7c3e279081c932f30231a060feb5df3460055b2 (patch) | |
| tree | 3e6e250f58fbe04a316245469edb66799ab3920f | |
| parent | f9d4fc347ba7927d4a723c3226f215bdcaab126e (diff) | |
xspice: use spiceqxl as name of xspice driver
Fixes a few places that have hardcoded "qxl" to use the already defined
QXL_DRIVER_NAME.
| -rw-r--r-- | src/qxl.h | 5 | ||||
| -rw-r--r-- | src/qxl_driver.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -49,8 +49,13 @@ #define hidden _X_HIDDEN +#ifdef XSPICE +#define QXL_NAME "spiceqxl" +#define QXL_DRIVER_NAME "spiceqxl" +#else #define QXL_NAME "qxl" #define QXL_DRIVER_NAME "qxl" +#endif #define PCI_VENDOR_RED_HAT 0x1b36 #define PCI_CHIP_QXL_0100 0x0100 diff --git a/src/qxl_driver.c b/src/qxl_driver.c index c66bffb..ffea383 100644 --- a/src/qxl_driver.c +++ b/src/qxl_driver.c @@ -1385,7 +1385,7 @@ static void qxl_init_scrn(ScrnInfoPtr pScrn) { pScrn->driverVersion = 0; - pScrn->driverName = pScrn->name = "qxl"; + pScrn->driverName = pScrn->name = QXL_DRIVER_NAME; pScrn->PreInit = qxl_pre_init; pScrn->ScreenInit = qxl_screen_init; pScrn->SwitchMode = qxl_switch_mode; @@ -1465,7 +1465,7 @@ qxl_pci_probe(DriverPtr drv, int entity, struct pci_device *dev, intptr_t match) static DriverRec qxl_driver = { 0, - "qxl", + QXL_DRIVER_NAME, qxl_identify, qxl_probe, NULL, @@ -1495,7 +1495,7 @@ qxl_setup(pointer module, pointer opts, int *errmaj, int *errmin) } static XF86ModuleVersionInfo qxl_module_info = { - "qxl", + QXL_DRIVER_NAME, MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, |