diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/input/misc/yealink.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/input/misc/yealink.h')
| -rw-r--r-- | drivers/input/misc/yealink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/yealink.h b/drivers/input/misc/yealink.h index 48af0be9cbdf..1e0f52397010 100644 --- a/drivers/input/misc/yealink.h +++ b/drivers/input/misc/yealink.h | |||
| @@ -127,7 +127,7 @@ struct yld_ctl_packet { | |||
| 127 | * yld_status struct. | 127 | * yld_status struct. |
| 128 | */ | 128 | */ |
| 129 | 129 | ||
| 130 | /* LCD, each segment must be driven seperately. | 130 | /* LCD, each segment must be driven separately. |
| 131 | * | 131 | * |
| 132 | * Layout: | 132 | * Layout: |
| 133 | * | 133 | * |