xf86-input-joystick: Changes to 'master'

[Peter Hutterer]

 src/jstk_key.c |   65 ++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 21 deletions(-)

New commits:
commit 7ccf3a75292d71104c976bf6afb389cccaac1a7d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Oct 31 14:33:08 2011 +1000

    Deal with opaque input option types.
    
    ABI 14 made the InputOption type opaque, move the existing code to ifdefs
    and use the new function calls otherwise.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

commit e0193debf8f5a72b0a06977d5dea3365ad9cafbe
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Oct 31 14:27:22 2011 +1000

    Fix option type for option duplication
    
    xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption
    list.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>