diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /drivers/serial/sh-sci.c | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/serial/sh-sci.c')
| -rw-r--r-- | drivers/serial/sh-sci.c | 8 |
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) | |||
| 184 | int h, l; | 184 | int h, l; |
| 185 | 185 | ||
| 186 | c = *p++; | 186 | c = *p++; |
| 187 | h = highhex(c); | 187 | h = hex_asc_hi(c); |
| 188 | l = lowhex(c); | 188 | l = hex_asc_lo(c); |
| 189 | put_char(port, h); | 189 | put_char(port, h); |
| 190 | put_char(port, l); | 190 | put_char(port, l); |
| 191 | checksum += h + l; | 191 | checksum += h + l; |
| 192 | } | 192 | } |
| 193 | put_char(port, '#'); | 193 | put_char(port, '#'); |
| 194 | put_char(port, highhex(checksum)); | 194 | put_char(port, hex_asc_hi(checksum)); |
| 195 | put_char(port, lowhex(checksum)); | 195 | put_char(port, hex_asc_lo(checksum)); |
| 196 | } while (get_char(port) != '+'); | 196 | } while (get_char(port) != '+'); |
| 197 | } else | 197 | } else |
| 198 | #endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */ | 198 | #endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */ |