diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-18 23:31:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-18 23:31:08 +0000 |
| commit | e8f9b6396e79654ea5932f64131cafbe8caadfb1 (patch) | |
| tree | 90cf8b3a2475a774369eda22247cab7874fd7bbf /include/linux | |
| parent | d4c419dfaa853f5db107973976d4215ae648e976 (diff) | |
Merge with Linux 2.4.0-test5-pre2.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fddidevice.h | 1 | ||||
| -rw-r--r-- | include/linux/mm.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/fddidevice.h b/include/linux/fddidevice.h index 8821bbdb1..79f92ff17 100644 --- a/include/linux/fddidevice.h +++ b/include/linux/fddidevice.h @@ -34,6 +34,7 @@ extern int fddi_header(struct sk_buff *skb, extern int fddi_rebuild_header(struct sk_buff *skb); extern unsigned short fddi_type_trans(struct sk_buff *skb, struct net_device *dev); +extern struct net_device * init_fddidev(struct net_device *, int); #endif #endif /* _LINUX_FDDIDEVICE_H */ diff --git a/include/linux/mm.h b/include/linux/mm.h index f418100a9..70f57f770 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -52,8 +52,8 @@ struct vm_area_struct { struct vm_area_struct * vm_avl_left; struct vm_area_struct * vm_avl_right; - /* For areas with inode, the list inode->i_mmap, for shm areas, - * the list of attaches, otherwise unused. + /* For areas with inode, the list inode->i_mapping->i_mmap, + * for shm areas, the list of attaches, otherwise unused. */ struct vm_area_struct *vm_next_share; struct vm_area_struct **vm_pprev_share; |