diff options
author | Wolfgang Denk <wd@nyx.denx.de> | 2006-10-11 14:15:21 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@nyx.denx.de> | 2006-10-11 14:15:21 +0200 |
commit | fb883a521e04437acfe989de3e152b2e4866856b (patch) | |
tree | 0cf61f45ae693082b24ced9c1da9a87bdd0cabbd /include/linux/mtd/compat.h | |
parent | 4a39616da41840bbc5b4c3f69df9861c2e6a8425 (diff) | |
parent | 2255b2d2044d434463eb2661e18018e50f1643d9 (diff) | |
download | blackbird-obmc-uboot-fb883a521e04437acfe989de3e152b2e4866856b.tar.gz blackbird-obmc-uboot-fb883a521e04437acfe989de3e152b2e4866856b.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 460cd45c80..fe55087ea9 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) |