xf86-video-intel: src/sna/sna.h

[Chris Wilson]

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

New commits:
commit c326ed192bcaeea41bb93b7077ec37a1437a4409
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Mar 24 11:38:35 2016 +0000

    sna/present: Add missing "static inline" for disabled present stubs
    
    Oops, copy'n'paste broke the non-Present build:
    
    sna_trapezoids_boxes.c:(.text+0x0): multiple definition of
    `sna_present_cancel_flip'
    
    Reported-by: Sedat Dilek <sedat.dilek at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna.h b/src/sna/sna.h
index 755bd8e..e5ca906 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -605,7 +605,7 @@ static inline bool sna_present_open(struct sna *sna, ScreenPtr pScreen) { return
 static inline void sna_present_update(struct sna *sna) { }
 static inline void sna_present_close(struct sna *sna, ScreenPtr pScreen) { }
 static inline void sna_present_vblank_handler(struct drm_event_vblank *event) { }
-void sna_present_cancel_flip(struct sna *sna) { }
+static inline void sna_present_cancel_flip(struct sna *sna) { }
 #endif
 
 extern bool sna_crtc_set_sprite_rotation(xf86CrtcPtr crtc, uint32_t rotation);