Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

This commit is contained in:
Linus Torvalds
2006-01-31 21:18:17 -08:00
18 changed files with 555 additions and 276 deletions

View File

@@ -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;