diff options
author | 2013-06-24 15:17:53 -0700 | |
---|---|---|
committer | 2013-06-24 15:17:53 -0700 | |
commit | 805bf3daf361a501594f8b27b394a8d7372ebe3c (patch) | |
tree | c71fe689115c7fa0f270d31fcef75fe61d81318c /arch/parisc/include/asm/pci.h | |
parent | tty: Reset itty for other pty (diff) | |
parent | Linux 3.10-rc7 (diff) | |
download | linux-dev-805bf3daf361a501594f8b27b394a8d7372ebe3c.tar.xz linux-dev-805bf3daf361a501594f8b27b394a8d7372ebe3c.zip |
Merge 3.10-rc7 into tty-next
We want the tty fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc/include/asm/pci.h')
-rw-r--r-- | arch/parisc/include/asm/pci.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/pci.h b/arch/parisc/include/asm/pci.h index 3234f492d575..465154076d23 100644 --- a/arch/parisc/include/asm/pci.h +++ b/arch/parisc/include/asm/pci.h @@ -225,4 +225,9 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) return channel ? 15 : 14; } +#define HAVE_PCI_MMAP + +extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, + enum pci_mmap_state mmap_state, int write_combine); + #endif /* __ASM_PARISC_PCI_H */ |