Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=57e4acb3f63e1d3d74a75613eefde8b2d68164e3
Commit: 57e4acb3f63e1d3d74a75613eefde8b2d68164e3
Parent: dd172d72addefd89795e819cc2cc3eb1b9d12a7f
Author: Tony Luck <[EMAIL PROTECTED]>
AuthorDate: Thu Jul 12 16:04:39 2007 -0700
Committer: Tony Luck <[EMAIL PROTECTED]>
CommitDate: Thu Jul 12 16:04:39 2007 -0700
[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 <[EMAIL PROTECTED]>
---
include/asm-ia64/pci.h | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index 3523d25..0149097 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
