diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-01-19 09:12:48 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-01-19 09:12:48 +0900 |
| commit | b097d552bc9ee0351bb0c3d1219856e845df59f9 (patch) | |
| tree | 3b2b8391ec989d9a8b561ce8234dde3b1d481880 /include/linux/mtd/compat.h | |
| parent | e598dfc22c8789991d165714bec53b2390fc999d (diff) | |
| parent | a7709d926dbc7cb1541034fcf2b21ce3e838cb12 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/linux/mtd/compat.h')
| -rw-r--r-- | include/linux/mtd/compat.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h index f0c8464db5a..39c693f7a8c 100644 --- a/include/linux/mtd/compat.h +++ b/include/linux/mtd/compat.h @@ -48,8 +48,5 @@ #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) - #define PAGE_SIZE 4096 #endif |