Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66f49739 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0cdf6990 57e4acb3

include/asm-ia64/pci.h

+6 −4
Original line number Diff line number Diff line
@@ -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);