Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Un-break ia64 build

+6 -4
+6 -4
include/asm-ia64/pci.h
··· 96 96 #define HAVE_PCI_LEGACY 97 97 extern int pci_mmap_legacy_page_range(struct pci_bus *bus, 98 98 struct vm_area_struct *vma); 99 - extern ssize_t pci_read_legacy_io(struct kobject *kobj, char *buf, loff_t off, 100 - size_t count); 101 - extern ssize_t pci_write_legacy_io(struct kobject *kobj, char *buf, loff_t off, 102 - size_t count); 99 + extern ssize_t pci_read_legacy_io(struct kobject *kobj, 100 + struct bin_attribute *bin_attr, 101 + char *buf, loff_t off, size_t count); 102 + extern ssize_t pci_write_legacy_io(struct kobject *kobj, 103 + struct bin_attribute *bin_attr, 104 + char *buf, loff_t off, size_t count); 103 105 extern int pci_mmap_legacy_mem(struct kobject *kobj, 104 106 struct bin_attribute *attr, 105 107 struct vm_area_struct *vma);