summaryrefslogtreecommitdiff
path: root/drivers/input/misc/wistron_btns.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-11-13 13:44:12 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-11-13 13:44:12 +1100
commitb9a3c28d36496c1c3072dd849d92c0aa5370e1ab (patch)
treec088140a924b9e0dcceef0fd33a1f226ba1bf70a /drivers/input/misc/wistron_btns.c
parent155511577a3c438cb702dbe9bc172217ea44e62c (diff)
parentc977d19fc6767f8e45c6680766e8d8dacaabd724 (diff)
Merge remote branch 'input/next'
Diffstat (limited to 'drivers/input/misc/wistron_btns.c')
-rw-r--r--drivers/input/misc/wistron_btns.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index a932179c4c9e..00eb9d651d97 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -1263,7 +1263,7 @@ static int __devinit setup_input_dev(void)
if (!wistron_idev)
return -ENOMEM;
- wistron_idev->flush = wistron_flush;
+ wistron_idev->open = wistron_flush;
wistron_idev->poll = wistron_poll;
wistron_idev->poll_interval = POLL_INTERVAL_DEFAULT;