aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/evdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/evdev.c')
-rw-r--r--drivers/input/evdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 925571475005..0193dd4f0452 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -635,11 +635,11 @@ static ssize_t evdev_read(struct file *file, char __user *buffer,
}
/* No kernel lock - fine */
-static unsigned int evdev_poll(struct file *file, poll_table *wait)
+static __poll_t evdev_poll(struct file *file, poll_table *wait)
{
struct evdev_client *client = file->private_data;
struct evdev *evdev = client->evdev;
- unsigned int mask;
+ __poll_t mask;
poll_wait(file, &evdev->wait, wait);
+1 2011-04-15net/9p: nwname should be an unsigned intHarsh Prateek Bora3-8/+8 2011-04-159p: Fix sparse errorAneesh Kumar K.V3-6/+14 2011-04-15fs/9p: Fix error reported by coccicheckAneesh Kumar K.V1-1/+1 2011-04-159p: revert tsyncfs related changesAneesh Kumar K.V6-62/+11 2011-04-15fs/9p: Use write_inode for data sync on serverAneesh Kumar K.V1-0/+47 2011-04-15fs/9p: Fix revalidate to return correct valueAneesh Kumar K.V1-1/+3 2011-04-15x86, NUMA: Fix fakenuma boot failureKOSAKI Motohiro1-0/+23 2011-04-15futex: Set FLAGS_HAS_TIMEOUT during futex_wait restart setupDarren Hart1-1/+1 2011-04-15vfs: fix incorrect dentry_update_name_case() BUG_ON() testLinus Torvalds1-1/+1 2011-04-15block: only force kblockd unplugging from the schedule() pathJens Axboe2-8/+9 2011-04-15block: cleanup the block plug helper functionsChristoph Hellwig2-21/+9 2011-04-14mm/thp: use conventional format for boolean attributesBen Hutchings1-10/+14 2011-04-14ramfs: fix memleak on no-mmu archBob Liu1-0/+1 2011-04-14um: disable CONFIG_CMPXCHG_LOCALRichard Weinberger1-0/+4