diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 14:20:58 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 14:20:58 -0700 |
| commit | dde3ada3d0069855eeb353707b2b0f946191cfd6 (patch) | |
| tree | bdc2d358f8dc7fc29000149ebc4db949934b15b2 /drivers/input/apm-power.c | |
| parent | 5e056ef4ddeb6129f6bb170f2c26b8f370bbcda7 (diff) | |
| parent | fb4f552e895cec29934d94a99cbd1f1f00448a88 (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.7 merge window.
Diffstat (limited to 'drivers/input/apm-power.c')
| -rw-r--r-- | drivers/input/apm-power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/apm-power.c b/drivers/input/apm-power.c index e90ee3d3061..650177a3c85 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) |