diff options
| author | Tim Newsome <tim@sifive.com> | 2018-08-29 16:00:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 16:00:51 -0700 |
| commit | 2608b8e25dc6a8d29658b66055ce1d942052cdb3 (patch) | |
| tree | 6a2fefcd21c45a4b23e81beda99098e8440a6cb1 /src | |
| parent | 164415cfbe1647b19661f9e4046372dd5df2c204 (diff) | |
| download | riscv-openocd-2608b8e25dc6a8d29658b66055ce1d942052cdb3.zip riscv-openocd-2608b8e25dc6a8d29658b66055ce1d942052cdb3.tar.gz riscv-openocd-2608b8e25dc6a8d29658b66055ce1d942052cdb3.tar.bz2 | |
Fix strange merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/target/riscv/debug_defines.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/target/riscv/debug_defines.h b/src/target/riscv/debug_defines.h index 0cabf15..d6ddd4f 100644 --- a/src/target/riscv/debug_defines.h +++ b/src/target/riscv/debug_defines.h @@ -1219,8 +1219,6 @@ * * An implementation may report "Other" (7) for any error condition. * -* An implementation may report "Other" (7) for any error condition. -* * 0: There was no bus error. * * 1: There was a timeout. |