diff options
Diffstat (limited to 'arch/powerpc/platforms/powermac/udbg_adb.c')
-rw-r--r-- | arch/powerpc/platforms/powermac/udbg_adb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/powermac/udbg_adb.c b/arch/powerpc/platforms/powermac/udbg_adb.c index 3d5ed23bf0e0..06c8265c2baf 100644 --- a/arch/powerpc/platforms/powermac/udbg_adb.c +++ b/arch/powerpc/platforms/powermac/udbg_adb.c | |||
@@ -29,7 +29,7 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | static void (*udbg_adb_old_putc)(char c); | 31 | static void (*udbg_adb_old_putc)(char c); |
32 | static char (*udbg_adb_old_getc)(void); | 32 | static int (*udbg_adb_old_getc)(void); |
33 | static int (*udbg_adb_old_getc_poll)(void); | 33 | static int (*udbg_adb_old_getc_poll)(void); |
34 | 34 | ||
35 | static enum { | 35 | static enum { |
@@ -73,7 +73,7 @@ static unsigned char xmon_shift_keytab[128] = | |||
73 | "\0.\0*\0+\0\0\0\0\0/\r\0-\0" /* 0x40 - 0x4f */ | 73 | "\0.\0*\0+\0\0\0\0\0/\r\0-\0" /* 0x40 - 0x4f */ |
74 | "\0\0000123456789\0\0\0"; /* 0x50 - 0x5f */ | 74 | "\0\0000123456789\0\0\0"; /* 0x50 - 0x5f */ |
75 | 75 | ||
76 | static char udbg_adb_local_getc(void) | 76 | static int udbg_adb_local_getc(void) |
77 | { | 77 | { |
78 | int k, t, on; | 78 | int k, t, on; |
79 | 79 | ||
@@ -116,7 +116,7 @@ static char udbg_adb_local_getc(void) | |||
116 | } | 116 | } |
117 | #endif /* CONFIG_BOOTX_TEXT */ | 117 | #endif /* CONFIG_BOOTX_TEXT */ |
118 | 118 | ||
119 | static char udbg_adb_getc(void) | 119 | static int udbg_adb_getc(void) |
120 | { | 120 | { |
121 | #ifdef CONFIG_BOOTX_TEXT | 121 | #ifdef CONFIG_BOOTX_TEXT |
122 | if (udbg_adb_use_btext && input_type != input_adb_none) | 122 | if (udbg_adb_use_btext && input_type != input_adb_none) |
@@ -195,7 +195,7 @@ int udbg_adb_init(int force_btext) | |||
195 | */ | 195 | */ |
196 | for (np = NULL; (np = of_find_node_by_name(np, "keyboard")) != NULL;) { | 196 | for (np = NULL; (np = of_find_node_by_name(np, "keyboard")) != NULL;) { |
197 | struct device_node *parent = of_get_parent(np); | 197 | struct device_node *parent = of_get_parent(np); |
198 | int found = (parent && !strcmp(parent->type, "adb") == 0); | 198 | int found = (parent && strcmp(parent->type, "adb") == 0); |
199 | of_node_put(parent); | 199 | of_node_put(parent); |
200 | if (found) | 200 | if (found) |
201 | break; | 201 | break; |