diff options
| author | Avik Sil <avik.sil@linaro.org> | 2011-03-31 11:06:38 +0000 |
|---|---|---|
| committer | Avik Sil <avik.sil@linaro.org> | 2011-03-31 11:06:38 +0000 |
| commit | ebb688e3183bd5891312bdb8f4e2f520d70b36b6 (patch) | |
| tree | c30d1abefaccc8cd1baa4944aae3348668e13bde /drivers/input | |
| parent | 8061f3a885ec3538bf405ff3957c205b1ab2aae4 (diff) | |
| parent | b2afcd30fff4c24290a63a2497de301864d9726d (diff) | |
Merge remote branch 'lttng/2.6.38-lttng-0.247'
Conflicts:
arch/arm/kernel/traps.c
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index 11905b6a302..38930b01cb2 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -218,6 +218,9 @@ static void input_handle_event(struct input_dev *dev, { int disposition = INPUT_IGNORE_EVENT; + trace_mark(input, input_event, + "type %u code %u value %d", type, code, value); + switch (type) { case EV_SYN: |