From: Tony Luck Date: Thu, 12 Jul 2007 23:04:39 +0000 (-0700) Subject: [IA64] Un-break ia64 build X-Git-Tag: v2.6.23-rc1~1084^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=57e4acb3f63e1d3d74a75613eefde8b2d68164e3;p=linux-2.6-omap-h63xx.git [IA64] Un-break ia64 build Commit 91a6902958f052358899f58683d44e36228d85c2 added an extra argument to pci_read_legacy_io() and pci_write_legacy_io(). But the prototypes in include/asm-ia64/pci.h were not updated. Signed-off-by: Tony Luck --- diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h index 3523d258459..0149097b736 100644 --- a/include/asm-ia64/pci.h +++ b/include/asm-ia64/pci.h @@ -96,10 +96,12 @@ extern int pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma, #define HAVE_PCI_LEGACY extern int pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma); -extern ssize_t pci_read_legacy_io(struct kobject *kobj, char *buf, loff_t off, - size_t count); -extern ssize_t pci_write_legacy_io(struct kobject *kobj, char *buf, loff_t off, - size_t count); +extern ssize_t pci_read_legacy_io(struct kobject *kobj, + struct bin_attribute *bin_attr, + char *buf, loff_t off, size_t count); +extern ssize_t pci_write_legacy_io(struct kobject *kobj, + struct bin_attribute *bin_attr, + char *buf, loff_t off, size_t count); extern int pci_mmap_legacy_mem(struct kobject *kobj, struct bin_attribute *attr, struct vm_area_struct *vma);