Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix up restorer in debug_trap exception return path.
  sh: Make is_valid_bugaddr() more intelligent on nommu.
  sh: use the common ascii hex helpers
  sh: fix sh7785 master clock value
  sh: Fix up thread info pointer in syscall_badsys resume path.
  sh: Fix up optimized SH-4 memcpy on big endian.
  sh: disable initrd defaults in .empty_zero_page.
  sh: display boot params by default on entry.

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 8fdafc27fce8..ce6ee92b3a1b 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -184,15 +184,15 @@ static void put_string(struct sci_port *sci_port, const char *buffer, int count)
                         int h, l;
 
                         c = *p++;
-                        h = highhex(c);
-                        l = lowhex(c);
+                        h = hex_asc_hi(c);
+                        l = hex_asc_lo(c);
                         put_char(port, h);
                         put_char(port, l);
                         checksum += h + l;
                 }
                 put_char(port, '#');
-                put_char(port, highhex(checksum));
-                put_char(port, lowhex(checksum));
+                put_char(port, hex_asc_hi(checksum));
+                put_char(port, hex_asc_lo(checksum));
             } while  (get_char(port) != '+');
         } else
 #endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */