diff options
| -rw-r--r-- | src/bios_reader/bios_reader.c | 2 | ||||
| -rw-r--r-- | src/i830_lvds.c | 8 | ||||
| -rw-r--r-- | src/i830_tv.c | 2 | ||||
| -rw-r--r-- | src/i965_hwmc.c | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c index 2b98e1f0..41908a3c 100644 --- a/src/bios_reader/bios_reader.c +++ b/src/bios_reader/bios_reader.c @@ -205,6 +205,7 @@ static void dump_general_definitions(void) free(block); } +#if 0 static void dump_child_devices(void) { struct bdb_block *block; @@ -238,6 +239,7 @@ static void dump_child_devices(void) free(block); } +#endif static void dump_lvds_options(void) { diff --git a/src/i830_lvds.c b/src/i830_lvds.c index 63533cdc..7569e99d 100644 --- a/src/i830_lvds.c +++ b/src/i830_lvds.c @@ -1059,7 +1059,7 @@ static Atom panel_fitting_name_atoms[NUM_PANEL_FITTING_TYPES]; static int -i830_backlight_control_lookup(char *name) +i830_backlight_control_lookup(const char *name) { int i; @@ -1116,7 +1116,7 @@ i830_lvds_set_backlight_control(xf86OutputPtr output) } static int -i830_panel_fitting_lookup(char *name) +i830_panel_fitting_lookup(const char *name) { int i; @@ -1258,7 +1258,7 @@ i830_lvds_set_property(xf86OutputPtr output, Atom property, } else if (property == backlight_control_atom) { INT32 backlight_range[2]; Atom atom; - char *name; + const char *name; int ret, data; if (value->type != XA_ATOM || value->format != 32 || value->size != 1) @@ -1300,7 +1300,7 @@ i830_lvds_set_property(xf86OutputPtr output, Atom property, return TRUE; } else if (property == panel_fitting_atom) { Atom atom; - char *name; + const char *name; int ret; if (value->type != XA_ATOM || value->format != 32 || value->size != 1) diff --git a/src/i830_tv.c b/src/i830_tv.c index 72d2bd8d..b13abd44 100644 --- a/src/i830_tv.c +++ b/src/i830_tv.c @@ -1606,7 +1606,7 @@ i830_tv_set_property(xf86OutputPtr output, Atom property, I830OutputPrivatePtr intel_output = output->driver_private; struct i830_tv_priv *dev_priv = intel_output->dev_priv; Atom atom; - char *name; + const char *name; char *val; if (value->type != XA_ATOM || value->format != 32 || value->size != 1) diff --git a/src/i965_hwmc.c b/src/i965_hwmc.c index 99e86f54..d9b4f0dd 100644 --- a/src/i965_hwmc.c +++ b/src/i965_hwmc.c @@ -44,6 +44,7 @@ static PutImageFuncPtr XvPutImage; +#if 0 static int alloc_drm_memory_tiled(ScrnInfoPtr pScrn, struct drm_memory_block *mem, char *name, size_t size, unsigned long pitch, unsigned long alignment) @@ -69,6 +70,8 @@ static int alloc_drm_memory_tiled(ScrnInfoPtr pScrn, mem->offset = mem->buffer->offset; return Success; } +#endif + static int alloc_drm_memory(ScrnInfoPtr pScrn, struct drm_memory_block *mem, char *name, size_t size) |