From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754579Ab0BIOIY (ORCPT ); Tue, 9 Feb 2010 09:08:24 -0500 Received: from sh.osrg.net ([192.16.179.4]:36545 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754542Ab0BIOIW (ORCPT ); Tue, 9 Feb 2010 09:08:22 -0500 From: e@lab.ntt.co.jp To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, fujita.tomonori@lab.ntt.co.jp, Paul Mundt Subject: [PATCH -mm 10/12] sh: use asm-generic/pci-dma-common.h Date: Tue, 9 Feb 2010 22:35:22 +0900 Message-Id: <1265722524-9493-11-git-send-email-e> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1265722524-9493-1-git-send-email-e> References: <1265722524-9493-1-git-send-email-e> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Tue, 09 Feb 2010 23:07:48 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: FUJITA Tomonori Signed-off-by: FUJITA Tomonori Cc: Paul Mundt --- arch/sh/include/asm/pci.h | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h index 1042f7f..3106018 100644 --- a/arch/sh/include/asm/pci.h +++ b/arch/sh/include/asm/pci.h @@ -87,20 +87,9 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) * configuration. */ #ifdef CONFIG_DMA_NONCOHERENT -#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)) -#else -#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) +#define HAVE_ARCH_PCI_UNMAP #endif +#include #ifdef CONFIG_PCI /* -- 1.5.6.5