diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-19 16:34:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-19 16:34:33 -0400 |
| commit | 96d6d72d4e6969dba026496917d82b311d74c3ca (patch) | |
| tree | 072673d8ad4ed203de4de7fd6155d8c67446d7fc /drivers/input/evdev.c | |
| parent | 4309e092421e08f411830b2675bc1538a9b90e9b (diff) | |
| parent | c85e2031eb55381a5e2f0f66c2e1d62ecd58eb85 (diff) | |
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: evdev - fix printf() format for sizeof
Input: remove version.h from drivers that don't need it
Input: cobalt_btns - add missing MODULE_LICENSE
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index a92d81567559..3524bef62be6 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -677,8 +677,8 @@ static int handle_eviocgbit(struct input_dev *dev, unsigned int cmd, void __user | |||
| 677 | len = OLD_KEY_MAX; | 677 | len = OLD_KEY_MAX; |
| 678 | if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000)) | 678 | if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000)) |
| 679 | printk(KERN_WARNING | 679 | printk(KERN_WARNING |
| 680 | "evdev.c(EVIOCGBIT): Suspicious buffer size %d, " | 680 | "evdev.c(EVIOCGBIT): Suspicious buffer size %u, " |
| 681 | "limiting output to %d bytes. See " | 681 | "limiting output to %zu bytes. See " |
| 682 | "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n", | 682 | "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n", |
| 683 | OLD_KEY_MAX, | 683 | OLD_KEY_MAX, |
| 684 | BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long)); | 684 | BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long)); |