diff options
| author | Adrian Bunk <bunk@fs.tum.de> | 2004-07-20 04:35:52 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2004-07-20 04:35:52 -0400 |
| commit | bde3bfee3f91c584973034e3b7b0e5963f2c11dd (patch) | |
| tree | deea960d7595023a2a0d88d2e298b9e9697fedc8 /include/linux/mtd | |
| parent | 1bb0fa189c6ae75cbf440244ae77a8ede9912df1 (diff) | |
MTD: remove some kernel 2.0 and 2.2 #ifdef's
The patch below (applies against 2.6.8-rc2) removes some #ifdef's for
kernel 2.0 and 2.2 from the MTD code.
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/cfi.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h index 12781628ccfa..a3efae0cd9a2 100644 --- a/include/linux/mtd/cfi.h +++ b/include/linux/mtd/cfi.h @@ -1,7 +1,7 @@ /* Common Flash Interface structures * See http://support.intel.com/design/flash/technote/index.htm - * $Id: cfi.h,v 1.44 2004/07/13 22:32:52 dwmw2 Exp $ + * $Id: cfi.h,v 1.45 2004/07/20 02:44:27 dwmw2 Exp $ */ #ifndef __MTD_CFI_H__ @@ -328,14 +328,12 @@ static inline uint8_t cfi_read_query(struct map_info *map, uint32_t addr) static inline void cfi_udelay(int us) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) unsigned long t = us * HZ / 1000000; if (t) { set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(t); return; } -#endif udelay(us); cond_resched(); } |