xf86-video-sis: Changes to 'master'

[Jeremy Huddleston]

Rebased ref, commits from common ancestor:
commit 2b459f385dc2f1b5e769e2ce84b6f4ec099c0a23
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Oct 31 11:57:49 2011 -0700

    Build fix for older servers (error: conflicting types for 'pciTag')
    
    /usr/include/xorg/xf86Pci.h:254:25: note: previous declaration of 'pciTag' was here
    
    Reported-by: Johannes Obermayr <johannesobermayr at gmx.de>
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>