From patchwork Fri Dec 28 19:23:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 16022 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TofYh-0008K0-Cp; Fri, 28 Dec 2012 20:25:31 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1TofYg-0007In-Fm; Fri, 28 Dec 2012 20:25:31 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754760Ab2L1TZJ (ORCPT + 1 other); Fri, 28 Dec 2012 14:25:09 -0500 Received: from georges.telenet-ops.be ([195.130.137.68]:44885 "EHLO georges.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754829Ab2L1TXp (ORCPT ); Fri, 28 Dec 2012 14:23:45 -0500 Received: from ayla.of.borg ([84.193.72.141]) by georges.telenet-ops.be with bizsmtp id h7Pi1k00g32ts5g067PiPa; Fri, 28 Dec 2012 20:23:43 +0100 Received: from geert by ayla.of.borg with local (Exim 4.71) (envelope-from ) id 1TofWw-0004kY-M4; Fri, 28 Dec 2012 20:23:42 +0100 From: Geert Uytterhoeven To: linux-arch@vger.kernel.org, Marek Szyprowski , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Cc: linux-m68k@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 1/4] m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA Date: Fri, 28 Dec 2012 20:23:31 +0100 Message-Id: <1356722614-18224-2-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.12.28.191515 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' In two places, we check !CONFIG_MMU_SUN3 while we should check CONFIG_HAS_DMA instead. While fixing this, the check in became redundant ( already handles this case), so just remove it. Signed-off-by: Geert Uytterhoeven --- arch/m68k/include/asm/dma-mapping.h | 5 ----- arch/m68k/kernel/Makefile | 4 +--- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/arch/m68k/include/asm/dma-mapping.h b/arch/m68k/include/asm/dma-mapping.h index 3e6b844..c68cdb4 100644 --- a/arch/m68k/include/asm/dma-mapping.h +++ b/arch/m68k/include/asm/dma-mapping.h @@ -5,7 +5,6 @@ struct scatterlist; -#ifndef CONFIG_MMU_SUN3 static inline int dma_supported(struct device *dev, u64 mask) { return 1; @@ -111,8 +110,4 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t handle) return 0; } -#else -#include -#endif - #endif /* _M68K_DMA_MAPPING_H */ diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile index 068ad49..655347d 100644 --- a/arch/m68k/kernel/Makefile +++ b/arch/m68k/kernel/Makefile @@ -20,7 +20,5 @@ obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o obj-$(CONFIG_MMU_SUN3) += ints.o vectors.o obj-$(CONFIG_PCI) += pcibios.o -ifndef CONFIG_MMU_SUN3 -obj-y += dma.o -endif +obj-$(CONFIG_HAS_DMA) += dma.o