[PATCHv2 xf86-video-sis] Fix build with XInput version 12.

[Peter Hutterer]

On Mon, Feb 06, 2012 at 11:15:31PM +0100, Johannes Obermayr wrote:
> ---
>  src/sis_driver.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/sis_driver.c b/src/sis_driver.c
> index d733f48..7a5be4e 100644
> --- a/src/sis_driver.c
> +++ b/src/sis_driver.c
> @@ -85,7 +85,7 @@
>  #include <X11/extensions/dpms.h>
>  #endif
>  
> -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
>  #include <inputstr.h> /* for inputInfo */
>  #endif
>  
> @@ -9358,7 +9358,7 @@ SISMergedPointerMoved(int scrnIndex, int x, int y)
>              x = (int)dx;
>              y = (int)dy;
>          }
> -#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 11
> +#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
>  	miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
>  #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
>  	miPointerSetPosition(inputInfo.pointer, x, y);
> -- 
> 1.7.7

merged, thanks.

   bdaf1ba..f5dafa2  master -> master

Cheers,
  Peter