diff options
| author | Tom Rix <[email protected]> | 2010-01-18 08:08:32 -0600 |
|---|---|---|
| committer | Tom Rix <[email protected]> | 2010-01-18 08:08:32 -0600 |
| commit | a7709d926dbc7cb1541034fcf2b21ce3e838cb12 (patch) | |
| tree | 72c58261577bc00d98dbd208e4fa95dfbb2487a5 /include/linux/mtd | |
| parent | 1c2a8e359ebbec0dbef62f5b54c72f9cd72ccd59 (diff) | |
| parent | 88ffb2665cd066b6b20cfaade13929d4e8428dde (diff) | |
Merge branch 't-ml-master' into t-master
Diffstat (limited to 'include/linux/mtd')
| -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 |