aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/include/asm/pci_64.h5
-rw-r--r--arch/sparc/kernel/pci.c6
2 files changed, 4 insertions, 7 deletions
diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h
index 2303635158f5..b957ca5527a3 100644
--- a/arch/sparc/include/asm/pci_64.h
+++ b/arch/sparc/include/asm/pci_64.h
@@ -42,13 +42,10 @@ static inline int pci_proc_domain(struct pci_bus *bus)
42/* Platform support for /proc/bus/pci/X/Y mmap()s. */ 42/* Platform support for /proc/bus/pci/X/Y mmap()s. */
43 43
44#define HAVE_PCI_MMAP 44#define HAVE_PCI_MMAP
45#define arch_can_pci_mmap_io() 1
45#define HAVE_ARCH_PCI_GET_UNMAPPED_AREA 46#define HAVE_ARCH_PCI_GET_UNMAPPED_AREA
46#define get_pci_unmapped_area get_fb_unmapped_area 47#define get_pci_unmapped_area get_fb_unmapped_area
47 48
48int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
49 enum pci_mmap_state mmap_state,
50 int write_combine);
51
52static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 49static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
53{ 50{
54 return PCI_IRQ_NONE; 51 return PCI_IRQ_NONE;
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 015e55a7495d..7eceaa10836f 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -862,9 +862,9 @@ static void __pci_mmap_set_pgprot(struct pci_dev *dev, struct vm_area_struct *vm
862 * 862 *
863 * Returns a negative error code on failure, zero on success. 863 * Returns a negative error code on failure, zero on success.
864 */ 864 */
865int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 865int pci_mmap_page_range(struct pci_dev *dev, int bar,
866 enum pci_mmap_state mmap_state, 866 struct vm_area_struct *vma,
867 int write_combine) 867 enum pci_mmap_state mmap_state, int write_combine)
868{ 868{
869 int ret; 869 int ret;
870 870