summaryrefslogtreecommitdiff
path: root/src/intel_module.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-07-30 13:19:27 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2013-07-30 13:26:14 +0100
commit208282d31657f2b718e151397d16b307cdf8f77b (patch)
tree14bedb1393d638bc6920bff68f948b9bb64af200 /src/intel_module.c
parent7e3445a330340c1aa2ca5a13d838344438336749 (diff)
Suppress a bunch of compiler warnings for using constant strings
We want these allocated in ro memory even if the antique API complains. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_module.c')
-rw-r--r--src/intel_module.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/intel_module.c b/src/intel_module.c
index 3c52c0f5..47e494c3 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -302,7 +302,7 @@ intel_detect_chipset(ScrnInfoPtr scrn,
name);
}
- scrn->chipset = name;
+ scrn->chipset = (char *)name;
}
/*
@@ -442,8 +442,8 @@ intel_scrn_create(DriverPtr driver,
return FALSE;
scrn->driverVersion = INTEL_VERSION;
- scrn->driverName = INTEL_DRIVER_NAME;
- scrn->name = INTEL_NAME;
+ scrn->driverName = (char *)INTEL_DRIVER_NAME;
+ scrn->name = (char *)INTEL_NAME;
scrn->driverPrivate = (void *)(match_data | 1);
scrn->Probe = NULL;
@@ -569,7 +569,7 @@ intel_available_options(int chipid, int busid)
static DriverRec intel = {
INTEL_VERSION,
- INTEL_DRIVER_NAME,
+ (char *)INTEL_DRIVER_NAME,
intel_identify,
NULL,
intel_available_options,