Merge linux-2.6 with linux-acpi-2.6

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/ppc64/xmon/start.c b/arch/ppc64/xmon/start.c
index f86b584acd76..e50c158191e1 100644
--- a/arch/ppc64/xmon/start.c
+++ b/arch/ppc64/xmon/start.c
@@ -61,7 +61,9 @@ xmon_read(void *handle, void *ptr, int nb)
 int
 xmon_read_poll(void)
 {
-        return udbg_getc_poll();
+        if (udbg_getc_poll)
+                return udbg_getc_poll();
+        return -1;
 }
  
 FILE *xmon_stdin;