Skip to content
Commit 356f9e74 authored by Olof Johansson's avatar Olof Johansson Committed by Linus Torvalds
Browse files

net: stmmac: fix bad merge conflict resolution

Merge commit 06c54055

 did a bad conflict resolution accidentally
leaving out a closing brace.  Add it back.

This breaks a handful of defconfigs on ARM, so it'd be good to see it
applied pretty quickly.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fc8cc677
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment