aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 21:18:17 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 21:18:17 -0800
commitd20e6336ea4250e51081e4b2924b9ef4dfa45909 (patch)
tree96c22694bec10912d40a3700a945157597dd901b /drivers/input/touchscreen
parentfa3c791d85aa9a363dd72dd834b73b79252ef44e (diff)
parent6dea93477c3377cf4199fd37cc3fb11071987ae4 (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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/mk712.c b/drivers/input/touchscreen/mk712.c
index 4844d250a5e..3226830eea0 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;