diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-06 01:59:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-06 01:59:55 -0700 |
| commit | 8348de406398a9e99be57ab0bccd5c6abe56a01d (patch) | |
| tree | 6cb526eb036dd2af1903d65a06513d52dc04fa25 /include/linux | |
| parent | 12028f96423afd19867b750e909edf24a3d9111e (diff) | |
| parent | 46cd109be444ee12f915a8ad1029169668fce2db (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/cfi.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 7f64f2b2cada..22dd6acdf9f1 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1527,6 +1527,8 @@ extern int simple_fill_super(struct super_block *, int, struct tree_descr *); extern int simple_pin_fs(char *name, struct vfsmount **mount, int *count); extern void simple_release_fs(struct vfsmount **mount, int *count); +extern ssize_t simple_read_from_buffer(void __user *, size_t, loff_t *, const void *, size_t); + extern int inode_change_ok(struct inode *, struct iattr *); extern int __must_check inode_setattr(struct inode *, struct iattr *); 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(); } |