diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 19:19:15 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 19:19:15 (GMT) |
| commit | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (patch) | |
| tree | 318d37a7d55c79e6f7d86163fb28e0eccbb0fe83 /drivers/char/lcd.h | |
| parent | 955c5038823748e529a49f0e33ab635d92843500 (diff) | |
| parent | 09af7b443c257460d45cb6c1896d29f173fef35b (diff) | |
| download | linux-e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab.tar.xz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
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 878a952..a8d4ae7 100644 --- a/drivers/char/lcd.h +++ b/drivers/char/lcd.h @@ -22,7 +22,7 @@ static int timeout(volatile unsigned long); #define MAX_IDLE_TIME 120 struct lcd_display { - unsigned long buttons; + unsigned buttons; int size1; int size2; unsigned char line1[LCD_CHARS_PER_LINE]; |