xserver: Branch 'master'

[Keith Packard]

 include/systemd-logind.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b972851ce47b5e3b681a212a43dd71aab94e7a1b
Author: Dave Airlie <airlied at gmail.com>
Date:   Mon Mar 10 08:58:37 2014 +1000

    xserver: fix build since system-logind.h
    
    on tinderbox and irc
    
    Reviewed-by: Hans de Goede <hdegoede at redhat.com>
    Reviewed-by: Matthieu Herrb <matthieu at herrb.eu>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/systemd-logind.h b/include/systemd-logind.h
index 8b09081..06dd031 100644
--- a/include/systemd-logind.h
+++ b/include/systemd-logind.h
@@ -36,8 +36,8 @@ void systemd_logind_vtenter(void);
 #else
 #define systemd_logind_init()
 #define systemd_logind_fini()
-#define systemd_logind_take_fd(major, minor, path) -1
-#define systemd_logind_release_fd(dev)
+#define systemd_logind_take_fd(major, minor, path, paus) -1
+#define systemd_logind_release_fd(major, minor)
 #define systemd_logind_controls_session() 0
 #define systemd_logind_vtenter()
 #endif