summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 21:14:47 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 21:14:47 +0000
commit0d47924bba0872ce4c6cadedff6783be3ce03f86 (patch)
treebfcf15e9ae4dbf0bed3e512884c0216018f2c12f /src
parenta9e83a10f9bfd354af448c20b41d0c85db7e489d (diff)
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.xf86-video-sunbw2-1.1.0sunbw2-1_1_0XORG-7_1
Diffstat (limited to 'src')
-rw-r--r--src/bw2.h1
-rw-r--r--src/bw2_driver.c9
2 files changed, 4 insertions, 6 deletions
diff --git a/src/bw2.h b/src/bw2.h
index 0134850..4eadaec 100644
--- a/src/bw2.h
+++ b/src/bw2.h
@@ -27,7 +27,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86RamDac.h"
#include <X11/Xmd.h>
#include "gcstruct.h"
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index 318adc4..1bd064c 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_driver.c
@@ -28,7 +28,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Version.h"
#include "mipointer.h"
#include "mibstore.h"
@@ -61,11 +60,11 @@ static ModeStatus BW2ValidMode(int scrnIndex, DisplayModePtr mode,
void BW2Sync(ScrnInfoPtr pScrn);
-#define VERSION 4000
+#define BW2_VERSION 4000
#define BW2_NAME "SUNBW2"
#define BW2_DRIVER_NAME "sunbw2"
#define BW2_MAJOR_VERSION 1
-#define BW2_MINOR_VERSION 0
+#define BW2_MINOR_VERSION 1
#define BW2_PATCHLEVEL 0
/*
@@ -77,7 +76,7 @@ void BW2Sync(ScrnInfoPtr pScrn);
*/
_X_EXPORT DriverRec SUNBW2 = {
- VERSION,
+ BW2_VERSION,
BW2_DRIVER_NAME,
BW2Identify,
BW2Probe,
@@ -251,7 +250,7 @@ BW2Probe(DriverPtr drv, int flags)
pScrn = xf86AllocateScreen(drv, 0);
/* Fill in what we can of the ScrnInfoRec */
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = BW2_VERSION;
pScrn->driverName = BW2_DRIVER_NAME;
pScrn->name = BW2_NAME;
pScrn->Probe = BW2Probe;