diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-07 17:43:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 17:43:08 -0500 |
| commit | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (patch) | |
| tree | a3c34ad86ccdc904bb43af6cd1cb163231c29276 /drivers/input/touchscreen/mk712.c | |
| parent | 076d022c566fddde41fd4a858dd24bacad8304d7 (diff) | |
| parent | e060e084e7d9e1c62d02cb6b8d3fe07db5317eaa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'drivers/input/touchscreen/mk712.c')
| -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 | ||