From bb5b6e6c4dea4242f6ff75fa7adecea4f34935f1 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 4 Feb 2002 20:10:26 -0800 Subject: v2.4.8.4 -> v2.4.9 - David Miller: sparc updates, FAT fs fixes, btaudio build fix - David Gibson: Orinoco driver update - Kevin Fleming: more disks the HPT controller doesn't like - David Miller: "min()/max()" cleanups. Understands signs and sizes. - Ben LaHaise: make vma merging more generous, help Mozilla /proc/<>/maps - Jens Axboe: CD updates - Trond Myklebust: save away NFS credentials in inode, so that mmap can writeout. - Mark Hemment: HIGHMEM ops cleanups - Jes Sorensen: use "unsigned long" for flags in various drivers --- include/linux/mtd/cfi.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/linux/mtd') 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) -- cgit v1.2.3