summaryrefslogtreecommitdiff
path: root/drivers/keyboard.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@nyx.denx.de>2006-06-19 01:46:08 +0200
committerWolfgang Denk <wd@nyx.denx.de>2006-06-19 01:46:08 +0200
commit8d352247ecf3638cdd1ef7df31a6ad700bb80574 (patch)
treed8f2202361ce6cc944abb39195f66411003b0571 /drivers/keyboard.c
parent9e18a4bc6cb512dc7ae3a6fc2ed912f71bd8c6c0 (diff)
parenta650cfa286e8933144a776693d56dfd858922aa4 (diff)
downloadu-boot-imx-8d352247ecf3638cdd1ef7df31a6ad700bb80574.zip
u-boot-imx-8d352247ecf3638cdd1ef7df31a6ad700bb80574.tar.gz
u-boot-imx-8d352247ecf3638cdd1ef7df31a6ad700bb80574.tar.bz2
Merge with ssh://atlas/home/wd/git/u-boot/work
Diffstat (limited to 'drivers/keyboard.c')
-rw-r--r--drivers/keyboard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/keyboard.c b/drivers/keyboard.c
index 1579095..41eccf2 100644
--- a/drivers/keyboard.c
+++ b/drivers/keyboard.c
@@ -33,7 +33,7 @@
#define KBD_BUFFER_LEN 0x20 /* size of the keyboardbuffer */
-#ifdef CONFIG_MPC5xxx
+#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC85xx)
int ps2ser_check(void);
#endif
@@ -75,7 +75,7 @@ static void kbd_put_queue(char data)
/* test if a character is in the queue */
static int kbd_testc(void)
{
-#ifdef CONFIG_MPC5xxx
+#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC85xx)
/* no ISR is used, so received chars must be polled */
ps2ser_check();
#endif
@@ -90,7 +90,7 @@ static int kbd_getc(void)
{
char c;
while(in_pointer==out_pointer) {
-#ifdef CONFIG_MPC5xxx
+#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC85xx)
/* no ISR is used, so received chars must be polled */
ps2ser_check();
#endif