summaryrefslogtreecommitdiff
path: root/include/linux/mtd
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/mtd')
-rw-r--r--include/linux/mtd/cfi.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index d32afe265335..3424ef2bc70e 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -365,10 +365,6 @@ static inline __u8 cfi_read_query(struct map_info *map, __u32 addr)
}
}
-#ifndef min
-#define min(x,y) ( (x)<(y)?(x):(y) )
-#endif
-
static inline void cfi_udelay(int us)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)