From e7e3ad689e3af7726e10d675dfafd45998a17b09 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 10 Mar 2010 15:23:24 -0800 Subject: [PATCH] --- yaml --- r: 187274 b: refs/heads/master c: 272ecbe5919d057388bbbea751fad5471aaf3f02 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/frv/include/asm/pci.h | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 4d6a898fc5e9..4ba7766a75a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccd7ab7f7efb4cb94b4a000ba220a0aeefe9bc11 +refs/heads/master: 272ecbe5919d057388bbbea751fad5471aaf3f02 diff --git a/trunk/arch/frv/include/asm/pci.h b/trunk/arch/frv/include/asm/pci.h index 8c7260a3cd41..05db569e52e8 100644 --- a/trunk/arch/frv/include/asm/pci.h +++ b/trunk/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,