diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 00:18:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 00:18:17 -0500 |
| commit | d20e6336ea4250e51081e4b2924b9ef4dfa45909 (patch) | |
| tree | 96c22694bec10912d40a3700a945157597dd901b /drivers/input/touchscreen | |
| parent | fa3c791d85aa9a363dd72dd834b73b79252ef44e (diff) | |
| parent | 6dea93477c3377cf4199fd37cc3fb11071987ae4 (diff) | |
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) | |||
| 154 | spin_unlock_irqrestore(&mk712_lock, flags); | 154 | spin_unlock_irqrestore(&mk712_lock, flags); |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | int __init mk712_init(void) | 157 | static int __init mk712_init(void) |
| 158 | { | 158 | { |
| 159 | int err; | 159 | int err; |
| 160 | 160 | ||