summaryrefslogtreecommitdiff
path: root/drivers/input/apm-power.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-16 10:30:09 (GMT)
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-16 10:30:09 (GMT)
commite7d9facf0bab6d919342fea17c8cc0f65f8a0fe9 (patch)
tree8301035b4dcb273c211c04fe2c0d1cbaf897021b /drivers/input/apm-power.c
parent28bcd199cc4465733c1ac0c70135a385fff97c71 (diff)
parentddffeb8c4d0331609ef2581d84de4d763607bd37 (diff)
downloadlinux-fsl-qoriq-e7d9facf0bab6d919342fea17c8cc0f65f8a0fe9.tar.xz
Merge tag 'v3.7-rc1'
Merge Linux 3.7-rc1 to get latest upstream changes.
Diffstat (limited to 'drivers/input/apm-power.c')
-rw-r--r--drivers/input/apm-power.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/apm-power.c b/drivers/input/apm-power.c
index e90ee3d..650177a 100644
--- a/drivers/input/apm-power.c
+++ b/drivers/input/apm-power.c
@@ -33,7 +33,7 @@ static void system_power_event(unsigned int keycode)
}
static void apmpower_event(struct input_handle *handle, unsigned int type,
- unsigned int code, int value)
+ unsigned int code, int value)
{
/* only react on key down events */
if (value != 1)