diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/input/keyboard/hil_kbd.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/input/keyboard/hil_kbd.c')
| -rw-r--r-- | drivers/input/keyboard/hil_kbd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c index 19fa94af207a..fed31e0947a1 100644 --- a/drivers/input/keyboard/hil_kbd.c +++ b/drivers/input/keyboard/hil_kbd.c | |||
| @@ -570,6 +570,8 @@ static struct serio_device_id hil_dev_ids[] = { | |||
| 570 | { 0 } | 570 | { 0 } |
| 571 | }; | 571 | }; |
| 572 | 572 | ||
| 573 | MODULE_DEVICE_TABLE(serio, hil_dev_ids); | ||
| 574 | |||
| 573 | static struct serio_driver hil_serio_drv = { | 575 | static struct serio_driver hil_serio_drv = { |
| 574 | .driver = { | 576 | .driver = { |
| 575 | .name = "hil_dev", | 577 | .name = "hil_dev", |