diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-11-27 16:13:00 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2006-11-27 16:13:00 +0100 |
| commit | d3c5e8b2f5945d93de8f23b053e9dcd033983245 (patch) | |
| tree | 72c292c41bc0dfadd6f634fe03e697d8a4473487 /include/linux/mtd/compat.h | |
| parent | 98280e3d431db77d92219438b8840853bd7cb412 (diff) | |
| parent | a9398e018593782c5fa7d0741955fc1256b34c1e (diff) | |
| download | olio-uboot-2014.01-d3c5e8b2f5945d93de8f23b053e9dcd033983245.tar.xz olio-uboot-2014.01-d3c5e8b2f5945d93de8f23b053e9dcd033983245.zip | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'include/linux/mtd/compat.h')
| -rw-r--r-- | include/linux/mtd/compat.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h index 460cd45c8..fe55087ea 100644 --- 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) |