Merge tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux into fixes

[~andy/linux] / lib / assoc_array.c

diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index 1b6a44f1ec3e3b10f3b02d19f8ab0ce59453f6d5..c0b1007011e188836616509deef5876c207d32d4 100644 (file)
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -157,7 +157,7 @@ enum assoc_array_walk_status {
        assoc_array_walk_tree_empty,
        assoc_array_walk_found_terminal_node,
        assoc_array_walk_found_wrong_shortcut,
-} status;
+};
 
 struct assoc_array_walk_result {
        struct {