diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
| commit | eda3d8f5604860aae1bb9996bb5efc4213778369 (patch) | |
| tree | 9d3887d2665bcc5f5abf200758794545c7b2c69b /drivers/input/serio/q40kbd.c | |
| parent | 87a9f704658a40940e740b1d73d861667e9164d3 (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'drivers/input/serio/q40kbd.c')
| -rw-r--r-- | drivers/input/serio/q40kbd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c index d962a8d78b14..e36a0901646c 100644 --- a/drivers/input/serio/q40kbd.c +++ b/drivers/input/serio/q40kbd.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * $Id: q40kbd.c,v 1.12 2002/02/02 22:26:44 vojtech Exp $ | ||
| 3 | * | ||
| 4 | * Copyright (c) 2000-2001 Vojtech Pavlik | 2 | * Copyright (c) 2000-2001 Vojtech Pavlik |
| 5 | * | 3 | * |
| 6 | * Based on the work of: | 4 | * Based on the work of: |
| @@ -49,7 +47,7 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); | |||
| 49 | MODULE_DESCRIPTION("Q40 PS/2 keyboard controller driver"); | 47 | MODULE_DESCRIPTION("Q40 PS/2 keyboard controller driver"); |
| 50 | MODULE_LICENSE("GPL"); | 48 | MODULE_LICENSE("GPL"); |
| 51 | 49 | ||
| 52 | DEFINE_SPINLOCK(q40kbd_lock); | 50 | static DEFINE_SPINLOCK(q40kbd_lock); |
| 53 | static struct serio *q40kbd_port; | 51 | static struct serio *q40kbd_port; |
| 54 | static struct platform_device *q40kbd_device; | 52 | static struct platform_device *q40kbd_device; |
| 55 | 53 | ||