From 272ecbe5919d057388bbbea751fad5471aaf3f02 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 10 Mar 2010 15:23:24 -0800 Subject: pci-dma: frv: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: David Howells Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/frv/include/asm/pci.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h index 8c7260a3cd41..05db569e52e8 100644 --- a/arch/frv/include/asm/pci.h +++ b/arch/frv/include/asm/pci.h @@ -43,13 +43,7 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size, /* Return the index of the PCI controller for device PDEV. */ #define pci_controller_num(PDEV) (0) -/* pci_unmap_{page,single} is a nop 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_unmap_len(PTR, LEN_NAME) (0) -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) +#include #ifdef CONFIG_PCI static inline void pci_dma_burst_advice(struct pci_dev *pdev, -- cgit v1.2.3