Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[u-boot] / .checkpatch.conf

diff --git a/.checkpatch.conf b/.checkpatch.conf
index 38386b354dadd99596a4b3efcb9d97d24508412c..d88af57129a82cf1b8cf772e9ca02d7c7a20efbb 100644 (file)
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -15,3 +15,6 @@
 
 # enable more tests
 --strict
+
+# Not Linux, so we don't recommend usleep_range() over udelay()
+--ignore USLEEP_RANGE