diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 19:54:12 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 19:54:12 -0500 |
commit | 625876f32ed63af262db3d0ac8178d2c0f510636 (patch) | |
tree | 93a0d2d5332fa679ecb99eee7b0955e444d6a41a /include/linux | |
parent | c902f981b79b512eb3d0c0410f8cae88c78beb57 (diff) | |
parent | b286e39207237e2f6929959372bf66d9a8d05a82 (diff) | |
download | op-kernel-dev-625876f32ed63af262db3d0ac8178d2c0f510636.zip op-kernel-dev-625876f32ed63af262db3d0ac8178d2c0f510636.tar.gz |
Merge branch 'master'
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/cciss_ioctl.h | 2 | ||||
-rw-r--r-- | include/linux/ide.h | 4 | ||||
-rw-r--r-- | include/linux/mm.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h index 424d5e6..6e27f42 100644 --- a/include/linux/cciss_ioctl.h +++ b/include/linux/cciss_ioctl.h @@ -10,8 +10,8 @@ typedef struct _cciss_pci_info_struct { unsigned char bus; - unsigned short domain; unsigned char dev_fn; + unsigned short domain; __u32 board_id; } cciss_pci_info_struct; diff --git a/include/linux/ide.h b/include/linux/ide.h index ac8b25f..e990190 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1089,9 +1089,11 @@ enum { /* * Subdrivers support. + * + * The gendriver.owner field should be set to the module owner of this driver. + * The gendriver.name field should be set to the name of this driver */ typedef struct ide_driver_s { - struct module *owner; const char *version; u8 media; unsigned supports_dsc_overlap : 1; diff --git a/include/linux/mm.h b/include/linux/mm.h index 1013a42..0986d19 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -940,7 +940,9 @@ unsigned long max_sane_readahead(unsigned long nr); /* Do stack extension */ extern int expand_stack(struct vm_area_struct *vma, unsigned long address); +#ifdef CONFIG_IA64 extern int expand_upwards(struct vm_area_struct *vma, unsigned long address); +#endif /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr); |