diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-29 11:15:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-29 11:15:32 -0800 |
| commit | 499a2673713c85734a54c37dd90b4b729de399c4 (patch) | |
| tree | 426f8e4c7c792dad998beeefb094c439a81b776b /drivers/input/misc | |
| parent | a7016235a61d520e6806f38129001d935c4b6661 (diff) | |
| parent | f6bdc2303da6786cc22a7d24b6790e9f75b4cfdc (diff) | |
| download | linux-499a2673713c85734a54c37dd90b4b729de399c4.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: update multi-touch protocol documentation Input: add the ABS_MT_PRESSURE event Input: winbond-cir - remove dmesg spam Input: lifebook - add another Lifebook DMI signature Input: ad7879 - support auxiliary GPIOs via gpiolib
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/winbond-cir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/winbond-cir.c b/drivers/input/misc/winbond-cir.c index 33309fe44e20..c8f5a9a3fa14 100644 --- a/drivers/input/misc/winbond-cir.c +++ b/drivers/input/misc/winbond-cir.c @@ -768,7 +768,7 @@ wbcir_parse_rc6(struct device *dev, struct wbcir_data *data) return; } - dev_info(dev, "IR-RC6 ad 0x%02X cm 0x%02X cu 0x%04X " + dev_dbg(dev, "IR-RC6 ad 0x%02X cm 0x%02X cu 0x%04X " "toggle %u mode %u scan 0x%08X\n", address, command, |