diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /drivers/char/lcd.h | |
| parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/lcd.h')
| -rw-r--r-- | drivers/char/lcd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/lcd.h b/drivers/char/lcd.h index 878a95280e87..a8d4ae737158 100644 --- a/drivers/char/lcd.h +++ b/drivers/char/lcd.h | |||
| @@ -22,7 +22,7 @@ static int timeout(volatile unsigned long); | |||
| 22 | #define MAX_IDLE_TIME 120 | 22 | #define MAX_IDLE_TIME 120 |
| 23 | 23 | ||
| 24 | struct lcd_display { | 24 | struct lcd_display { |
| 25 | unsigned long buttons; | 25 | unsigned buttons; |
| 26 | int size1; | 26 | int size1; |
| 27 | int size2; | 27 | int size2; |
| 28 | unsigned char line1[LCD_CHARS_PER_LINE]; | 28 | unsigned char line1[LCD_CHARS_PER_LINE]; |