From d8eab42e28ab9e3703fe115ee6ff01890d142dcd Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 10 Mar 2010 15:23:23 -0800 Subject: [PATCH] --- yaml --- r: 187273 b: refs/heads/master c: ccd7ab7f7efb4cb94b4a000ba220a0aeefe9bc11 h: refs/heads/master i: 187271: e2b66aa5758640ddaa524848318420444705b625 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 3 +++ trunk/arch/arm/include/asm/pci.h | 11 +---------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index a895e1a60e9b..4d6a898fc5e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08d925badd63a4e335905066152d96b83266987c +refs/heads/master: ccd7ab7f7efb4cb94b4a000ba220a0aeefe9bc11 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 3b181284970f..15d43c393353 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -155,6 +155,9 @@ config ARCH_MAY_HAVE_PC_FDC config ZONE_DMA bool +config NEED_DMA_MAP_STATE + def_bool y + config GENERIC_ISA_DMA bool diff --git a/trunk/arch/arm/include/asm/pci.h b/trunk/arch/arm/include/asm/pci.h index 226cddd2fb65..aea3450dd27a 100644 --- a/trunk/arch/arm/include/asm/pci.h +++ b/trunk/arch/arm/include/asm/pci.h @@ -30,16 +30,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) */ #define PCI_DMA_BUS_IS_PHYS (1) -/* - * Whether pci_unmap_{single,page} is a nop depends upon the - * configuration. - */ -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME; -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME; -#define pci_unmap_addr(PTR, ADDR_NAME) ((PTR)->ADDR_NAME) -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) (((PTR)->ADDR_NAME) = (VAL)) -#define pci_unmap_len(PTR, LEN_NAME) ((PTR)->LEN_NAME) -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) (((PTR)->LEN_NAME) = (VAL)) +#include #ifdef CONFIG_PCI static inline void pci_dma_burst_advice(struct pci_dev *pdev,