Merge branch 'master' into hpc2

[u-boot] / include / linux / mtd / compat.h

diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h
index 460cd45c808e67e8e1ce646cca1fbf0a56d182ac..fe55087ea93602d61e2e620f5849ba47553fd72a 100644 (file)
--- a/include/linux/mtd/compat.h
+++ b/include/linux/mtd/compat.h
@@ -31,11 +31,13 @@
 #define max_t(type,x,y) \
        ({ type __x = (x); type __y = (y); __x > __y ? __x: __y; })
 
+#ifndef BUG
 #define BUG() do { \
        printf("U-Boot BUG at %s:%d!\n", __FILE__, __LINE__); \
 } while (0)
 
 #define BUG_ON(condition) do { if (condition) BUG(); } while(0)
+#endif /* BUG */
 
 #define likely(x)      __builtin_expect(!!(x), 1)
 #define unlikely(x)    __builtin_expect(!!(x), 0)