summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-04-08 13:16:31 -0700
committerEric Anholt <eric@anholt.net>2014-06-15 22:49:12 +0100
commit57f58d3fa507ce5697afc3b5a8c21edf7e6802c9 (patch)
tree5249a4e9188b0e22916f3290ddb29f440fc0c338
parentc44bc9fab201873741134a27c7176946c95c7e36 (diff)
uxa: Clean up compiler warnings
These are some pretty simple compiler warning fixes. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--src/uxa/intel_display.c2
-rw-r--r--src/uxa/intel_hwmc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index 5bb9d72a..9d3d3712 100644
--- a/src/uxa/intel_display.c
+++ b/src/uxa/intel_display.c
@@ -184,7 +184,7 @@ intel_output_backlight_init(xf86OutputPtr output)
{
struct intel_output *intel_output = output->driver_private;
intel_screen_private *intel = intel_get_screen_private(output->scrn);
- char *str;
+ const char *str;
#if !USE_BACKLIGHT
return;
diff --git a/src/uxa/intel_hwmc.c b/src/uxa/intel_hwmc.c
index f991aa65..7c50b067 100644
--- a/src/uxa/intel_hwmc.c
+++ b/src/uxa/intel_hwmc.c
@@ -192,7 +192,7 @@ Bool intel_xvmc_adaptor_init(ScreenPtr pScreen)
ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
intel_screen_private *intel = intel_get_screen_private(scrn);
static XF86MCAdaptorRec *pAdapt;
- char *name;
+ const char *name;
char buf[64];
if (!intel->XvMCEnabled)