From 160b740455a4379c913d4935e9feaae828b07222 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 10 Mar 2010 15:23:26 -0800 Subject: [PATCH] --- yaml --- r: 187277 b: refs/heads/master c: 74a0bd66a3f78cb993144aaf336ce115017a0b5c h: refs/heads/master i: 187275: 68c58dddac1c4e58b5a46bb4e3cbd4a093972c21 v: v3 --- [refs] | 2 +- trunk/arch/parisc/Kconfig | 3 +++ trunk/arch/parisc/include/asm/pci.h | 14 +------------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index a3b618dc1d06..5f8ff399b659 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1e02b329d64353e67af070516a9bd14caff8bb0 +refs/heads/master: 74a0bd66a3f78cb993144aaf336ce115017a0b5c diff --git a/trunk/arch/parisc/Kconfig b/trunk/arch/parisc/Kconfig index f388dc68f605..9c4da3d63bfb 100644 --- a/trunk/arch/parisc/Kconfig +++ b/trunk/arch/parisc/Kconfig @@ -95,6 +95,9 @@ config PM config STACKTRACE_SUPPORT def_bool y +config NEED_DMA_MAP_STATE + def_bool y + config ISA_DMA_API bool diff --git a/trunk/arch/parisc/include/asm/pci.h b/trunk/arch/parisc/include/asm/pci.h index 64c7aa590ae5..632088d0aa67 100644 --- a/trunk/arch/parisc/include/asm/pci.h +++ b/trunk/arch/parisc/include/asm/pci.h @@ -183,19 +183,7 @@ struct pci_bios_ops { void (*fixup_bus)(struct pci_bus *bus); }; -/* pci_unmap_{single,page} is not a nop, thus... */ -#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 /* ** Stuff declared in arch/parisc/kernel/pci.c