From: FUJITA Tomonori Date: Wed, 10 Mar 2010 23:23:28 +0000 (-0800) Subject: pci-dma: xtensa: use include/linux/pci-dma.h X-Git-Tag: v2.6.34-rc2~106 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=479ea1e90c2b052de793a80ecc5eceab480f44ff;p=pandora-kernel.git pci-dma: xtensa: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Chris Zankel Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/xtensa/include/asm/pci.h b/arch/xtensa/include/asm/pci.h index 66410acf18b4..f3f0cf3439ad 100644 --- a/arch/xtensa/include/asm/pci.h +++ b/arch/xtensa/include/asm/pci.h @@ -56,13 +56,7 @@ struct pci_dev; #define PCI_DMA_BUS_IS_PHYS (1) -/* pci_unmap_{page,single} is a no-op, so */ -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) -#define pci_unmap_addr(PTR, ADDR_NAME) (0) -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) -#define pci_ubnmap_len(PTR, LEN_NAME) (0) -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) +#include /* Map a range of PCI memory or I/O space for a device into user space */ int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,