Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / kernel / time / posix-clock.c

diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
index cc91d90abd84d78b4af473e152b7d7d62f85796b..94ad46d50b56dfc21ff5a29e0955b50425c563f3 100644 (file)
--- a/kernel/time/posix-clock.c
+++ b/kernel/time/posix-clock.c
@@ -68,10 +68,10 @@ static ssize_t posix_clock_read(struct file *fp, char __user *buf,
        return err;
 }
 
-static unsigned int posix_clock_poll(struct file *fp, poll_table *wait)
+static __poll_t posix_clock_poll(struct file *fp, poll_table *wait)
 {
        struct posix_clock *clk = get_posix_clock(fp);
-       unsigned int result = 0;
+       __poll_t result = 0;
 
        if (!clk)
                return POLLERR;