diff options
| -rw-r--r-- | ChangeLog.cross | 4 | ||||
| -rw-r--r-- | src/arch-arm.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog.cross b/ChangeLog.cross index 9ffca02..d2354ce 100644 --- a/ChangeLog.cross +++ b/ChangeLog.cross @@ -1,3 +1,7 @@ +2006-08-18 Mark Hatle <mark.hatle@windriver.com> + + * arch-arm.c: remove prelink_conflict_rela + 2006-08-17 Mark Hatle <mark.hatle@windriver.com> * data.c, dso.c, prelink.h: when using elfutils/libelf, we need diff --git a/src/arch-arm.c b/src/arch-arm.c index 24766ab..dabea03 100644 --- a/src/arch-arm.c +++ b/src/arch-arm.c @@ -496,7 +496,6 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info, value = conflict_lookup_value (conflict); } - value = conflict_lookup_value (conflict); ret = prelink_conflict_add_rela (info); if (ret == NULL) return 1; |