ALSA: hda - Add SSID table for MacBookAir2,1

[safe/jmp/linux-2.6] / net / rds / af_rds.c

diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index c2e45e8..aebfecb 100644 (file)
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -33,6 +33,7 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/gfp.h>
 #include <linux/in.h>
 #include <linux/poll.h>
 #include <net/sock.h>
@@ -157,7 +158,7 @@ static unsigned int rds_poll(struct file *file, struct socket *sock,
        unsigned int mask = 0;
        unsigned long flags;
 
-       poll_wait(file, sk->sk_sleep, wait);
+       poll_wait(file, sk_sleep(sk), wait);
 
        if (rs->rs_seen_congestion)
                poll_wait(file, &rds_poll_waitq, wait);