diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-08-08 10:18:40 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-08-08 10:18:40 +0200 |
| commit | c23154aab5825fec81d5500c53eaa686646c76b5 (patch) | |
| tree | 32b0aafae49f664a65ced50981492bb031f006b8 /drivers/input/i8042.c | |
| parent | cb07d74e2e0c0a41533b6bcd551af9bf2ebcf2bc (diff) | |
| parent | 9d195a546179bc732aba9eacccf0a9a3db591288 (diff) | |
| download | blackbird-obmc-uboot-c23154aab5825fec81d5500c53eaa686646c76b5.tar.gz blackbird-obmc-uboot-c23154aab5825fec81d5500c53eaa686646c76b5.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/input/i8042.c')
| -rw-r--r-- | drivers/input/i8042.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c index 35fa0bb504..ca1604c540 100644 --- a/drivers/input/i8042.c +++ b/drivers/input/i8042.c @@ -398,7 +398,7 @@ int i8042_kbd_init(void) * i8042_tstc - test if keyboard input is available * option: cursor blinking if called in a loop */ -int i8042_tstc(void) +int i8042_tstc(struct stdio_dev *dev) { unsigned char scan_code = 0; @@ -432,7 +432,7 @@ int i8042_tstc(void) * i8042_getc - wait till keyboard input is available * option: turn on/off cursor while waiting */ -int i8042_getc(void) +int i8042_getc(struct stdio_dev *dev) { int ret_chr; unsigned char scan_code; |
