summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-12 16:46:01 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-12 16:46:01 -0700
commit66f49739fe1591197364f2dad1b67b975e8f5e85 (patch)
tree5c804af8a3789c0cdf319e27bad3005d6a471cdf /include
parent0cdf6990e992902ae59cbc625d28cb41390f378e (diff)
parent57e4acb3f63e1d3d74a75613eefde8b2d68164e3 (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/pci.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index 3523d2584598..0149097b736d 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);