diff options
| author | Stefan Roese <sr@denx.de> | 2006-09-18 10:48:03 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-09-18 10:48:03 +0200 |
| commit | 64cd52efd1dc51a4a5a0cf10efe5362fab27de29 (patch) | |
| tree | 64e046a7d8b2f0106bc387dd032734ad963f4e68 /include/linux/mtd/compat.h | |
| parent | 899620c2d66d4eef3b2a0034d062e71d45d886c9 (diff) | |
| parent | 854bc8da75709f13dab4cfa6e9094c0cb49b5c5a (diff) | |
Merge with /home/stefan/git/u-boot/denx
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) |