diff options
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c index 14b8362019..9f3ae1f8fe 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -249,7 +249,8 @@ static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn, static struct ll_merge_driver *ll_user_merge, **ll_user_merge_tail; static const char *default_ll_merge; -static int read_merge_config(const char *var, const char *value, void *cb) +static int read_merge_config(const char *var, const char *value, + void *UNUSED(cb)) { struct ll_merge_driver *fn; const char *key, *name; |