diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 21:18:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 21:18:17 -0800 |
| commit | d20e6336ea4250e51081e4b2924b9ef4dfa45909 (patch) | |
| tree | 96c22694bec10912d40a3700a945157597dd901b /drivers/input/touchscreen | |
| parent | Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 (diff) | |
| parent | Input: hiddev - fix off-by-one for num_values in uref_multi requests (diff) | |
| download | linux-dev-d20e6336ea4250e51081e4b2924b9ef4dfa45909.tar.xz linux-dev-d20e6336ea4250e51081e4b2924b9ef4dfa45909.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/touchscreen')
| -rw-r--r-- | drivers/input/touchscreen/mk712.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/mk712.c b/drivers/input/touchscreen/mk712.c index 4844d250a5eb..3226830eea08 100644 --- a/drivers/input/touchscreen/mk712.c +++ b/drivers/input/touchscreen/mk712.c @@ -154,7 +154,7 @@ static void mk712_close(struct input_dev *dev) spin_unlock_irqrestore(&mk712_lock, flags); } -int __init mk712_init(void) +static int __init mk712_init(void) { int err; |