xf86-input-joystick: Changes to 'master'

[Peter Hutterer]

 src/jstk.c         |   14 ++++++--------
 src/jstk_key.c     |    8 ++++----
 src/jstk_options.c |    4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

New commits:
commit cd6b81d377a5d541100996fa4e2ac2decffe65f1
Author: Trevor Woerner <twoerner at gmail.com>
Date:   Sun Oct 17 21:26:16 2010 -0400

    Code cleanup, bad structure initialization.
    
    The InputDriverRec data structure in xserver/hw/xfree86/common/xf86Xinput.h
    no longer contains an integer refCount member; as per commit
    d568221710959cf7d783e6ff0fb80fb43a231124.
    
    Signed-off-by: Trevor Woerner <twoerner at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 38363bde5d94c9a8f163fde31ede067f6d0d1669
Author: Trevor Woerner <twoerner at gmail.com>
Date:   Sun Oct 17 21:25:56 2010 -0400

    Deprecated code cleanup.
    
    Replace calls to deprecated functions (Xfree(), Xcalloc(), Xmalloc(), etc)
    with calls to standard dynamic memory functions (free(), calloc(), malloc(),
    etc) in driver code.
    
    Signed-off-by: Trevor Woerner <twoerner at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>