Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / .checkpatch.conf

diff --git a/.checkpatch.conf b/.checkpatch.conf
index d88af57129a82cf1b8cf772e9ca02d7c7a20efbb..95f19635d35a38fba1538d42a7ab138f7fcf0ff3 100644 (file)
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -18,3 +18,13 @@
 
 # Not Linux, so we don't recommend usleep_range() over udelay()
 --ignore USLEEP_RANGE
+
+# Ignore networking block comment style
+--ignore NETWORKING_BLOCK_COMMENT_STYLE
+
+# Ignore "WARNING: Prefer ether_addr_copy() over memcpy() if the Ethernet
+# addresses are __aligned(2)".
+--ignore PREFER_ETHER_ADDR_COPY
+
+# A bit shorter of a description is OK with us.
+--min-conf-desc-length=2