xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_glamor.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 67fb82a3f0759b171fea21b475a70fa825693570
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Tue Oct 1 09:35:30 2013 -0400

    radeon: fix the non-glamor build harder...
    
    I need to stop pushing patches first thing in the morning.
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_glamor.h b/src/radeon_glamor.h
index 0806f56..36addd7 100644
--- a/src/radeon_glamor.h
+++ b/src/radeon_glamor.h
@@ -91,7 +91,7 @@ static inline Bool radeon_glamor_pixmap_is_offscreen(PixmapPtr pixmap) { return
 
 static inline struct radeon_pixmap *radeon_get_pixmap_private(PixmapPtr pixmap) { return NULL; }
 
-static inline XF86VideoAdaptorPtr radeon_glamor_xv_init(ScreenPtr pScreen) { return NULL; }
+static inline XF86VideoAdaptorPtr radeon_glamor_xv_init(ScreenPtr pScreen, int num_adapt) { return NULL; }
 #endif
 
 #endif /* RADEON_GLAMOR_H */