4 files changed, 7 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/va/Makefile b/src/gallium/state_trackers/va/Makefile
index 1e22bb50d1d..dd303ebace9 100644
--- a/src/gallium/state_trackers/va/Makefile
+++ b/src/gallium/state_trackers/va/Makefile
@@ -19,7 +19,8 @@ C_SOURCES = htab.c \
 	    va_buffer.c \
 	    va_config.c \
             va_picture.c \
-            va_surface.c
+            va_surface.c \
+	    va_display.c
 	    
 
 
diff --git a/src/gallium/state_trackers/va/va_config.c b/src/gallium/state_trackers/va/va_config.c
index 5756c2f155d..591d113a916 100644
--- a/src/gallium/state_trackers/va/va_config.c
+++ b/src/gallium/state_trackers/va/va_config.c
@@ -29,7 +29,7 @@
 #include <va/va_backend.h>
 #include "va_private.h"
 
-VAStatus vlVaConfigProfiles(       VADriverContextP ctx,
+VAStatus vlVaQueryConfigProfiles(       VADriverContextP ctx,
                                    VAProfile *profile_list,
                                    int *num_profiles)
 {
@@ -40,7 +40,7 @@ VAStatus vlVaConfigProfiles(       VADriverContextP ctx,
 }
 
 
-VAStatus vlVaConfigEntrypoints(       VADriverContextP ctx,
+VAStatus vlVaQueryConfigEntrypoints(       VADriverContextP ctx,
                                       VAProfile profile,
                                       VAEntrypoint *entypoint_list,
                                       int *num_entrypoints)
@@ -98,3 +98,4 @@ VAStatus vlVaQueryConfigAttributes(       VADriverContextP ctx,
 
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
+
diff --git a/src/gallium/state_trackers/va/va_context.c b/src/gallium/state_trackers/va/va_context.c
index 7ef84606305..1e3ab9cb22e 100644
--- a/src/gallium/state_trackers/va/va_context.c
+++ b/src/gallium/state_trackers/va/va_context.c
@@ -84,6 +84,5 @@ VAStatus vlVaTerminate(       VADriverContextP ctx)
 {
 	if (!ctx)
 		return VA_STATUS_ERROR_INVALID_CONTEXT;
-
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
diff --git a/src/gallium/state_trackers/va/va_image.c b/src/gallium/state_trackers/va/va_image.c
index b1f990a15eb..40a96d3ea48 100644
--- a/src/gallium/state_trackers/va/va_image.c
+++ b/src/gallium/state_trackers/va/va_image.c
@@ -66,7 +66,7 @@ VAStatus vlVaDeriveImage(	VADriverContextP ctx,
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
 
-VAStatus vlDestroyImage(	VADriverContextP ctx,
+VAStatus vlVaDestroyImage(	VADriverContextP ctx,
                             VAImageID image)
 {
 	if (!ctx)
@@ -76,7 +76,7 @@ VAStatus vlDestroyImage(	VADriverContextP ctx,
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
 
-VAStatus vlSetImagePalette(	VADriverContextP ctx,
+VAStatus vlVaSetImagePalette(	VADriverContextP ctx,
                             VAImageID image,
                             unsigned char *palette)
 {