X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapm_32.c;fp=arch%2Fx86%2Fkernel%2Fapm_32.c;h=ab186534200294e67452b8a675db329a5e2032b9;hp=e4b0d92b3ae067cec7f68acc76d7ac4615fe43b1;hb=b146e2ce804e76cffcfc17393ca7aa5e17e6037c;hpb=76d2d4a11b877e9f10f3d494180ec9a6f01f0857

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index e4b0d92b3ae0..ab1865342002 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1506,7 +1506,7 @@ static ssize_t do_read(struct file *fp, char __user *buf, size_t count, loff_t *
 	return 0;
 }
 
-static unsigned int do_poll(struct file *fp, poll_table *wait)
+static __poll_t do_poll(struct file *fp, poll_table *wait)
 {
 	struct apm_user *as;