diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
| commit | 4c0e799a9a6dc64426ddb6c03aea1a154357658f (patch) | |
| tree | 2d9aa9493d80fceb178a63bf15bb3d9edfc5fbae /drivers/input/misc/yealink.c | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | b8d055a878ee0f997ded40649701089d2486f850 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/misc/yealink.c')
| -rw-r--r-- | drivers/input/misc/yealink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c index facefd3dba29..11b5c7e84ed1 100644 --- a/drivers/input/misc/yealink.c +++ b/drivers/input/misc/yealink.c | |||
| @@ -52,8 +52,8 @@ | |||
| 52 | #include <linux/module.h> | 52 | #include <linux/module.h> |
| 53 | #include <linux/rwsem.h> | 53 | #include <linux/rwsem.h> |
| 54 | #include <linux/usb/input.h> | 54 | #include <linux/usb/input.h> |
| 55 | #include <linux/map_to_7segment.h> | ||
| 55 | 56 | ||
| 56 | #include "map_to_7segment.h" | ||
| 57 | #include "yealink.h" | 57 | #include "yealink.h" |
| 58 | 58 | ||
| 59 | #define DRIVER_VERSION "yld-20051230" | 59 | #define DRIVER_VERSION "yld-20051230" |