From patchwork Tue Feb 3 23:03:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 5772041 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 89E2F9F2ED for ; Tue, 3 Feb 2015 23:04:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF15F202A1 for ; Tue, 3 Feb 2015 23:04:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D78BE20295 for ; Tue, 3 Feb 2015 23:04:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752809AbbBCXEE (ORCPT ); Tue, 3 Feb 2015 18:04:04 -0500 Received: from mail-oi0-f46.google.com ([209.85.218.46]:56086 "EHLO mail-oi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922AbbBCXED (ORCPT ); Tue, 3 Feb 2015 18:04:03 -0500 Received: by mail-oi0-f46.google.com with SMTP id a141so51800576oig.5 for ; Tue, 03 Feb 2015 15:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=RIjz4EfoiHvM0hPSZmRb9UzM9BOu9qXp1A9m8fueN1o=; b=xjoOjplxuWLJCOFg237NQyo2oZ1hXqd0aqyRDbPNPXQ13462piwbeAF2Q9WKgNAAwx oy9lROpllW7R4kgYJ9wqmvm97/aGPlWK3sfa5hHjuZbOnKZqnZuL334P7czq5o8gAir/ j6D42u09tDQkxsrF+xWfVb4mzG5CtUQDtGl0vQkKVh6J73uaiJwPD4x+udmGa8YT5o77 J9CW1yN1frrMPOcvB7YfOU68LKwJNRjSzQ16nuzSSokUPVTu5c+ragdF0qExsfyhyg+b y2KSv25lTDEobTJ/S9ucrEuWgxc4+ZWpJevoMRv3CUj7QxkaXi5marnJRWUHmoZ9oTYM 5YnA== X-Received: by 10.202.192.11 with SMTP id q11mr15799348oif.41.1423004641722; Tue, 03 Feb 2015 15:04:01 -0800 (PST) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by mx.google.com with ESMTPSA id wc6sm11584481obc.8.2015.02.03.15.03.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Feb 2015 15:04:00 -0800 (PST) From: Rob Herring To: Mark Brown Cc: Rob Herring , Daniel Mack , Haojian Zhuang , Robert Jarzmik , linux-spi@vger.kernel.org Subject: [PATCH] spi: spi-pxa2xx: only include mach/dma.h for legacy DMA Date: Tue, 3 Feb 2015 17:03:35 -0600 Message-Id: <1423004615-16085-1-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move the include of mach/dma.h to the legacy PXA DMA code where it is used. This enables building spi-pxa2xx on ARM64. Signed-off-by: Rob Herring Cc: Daniel Mack Cc: Haojian Zhuang Cc: Robert Jarzmik Cc: Mark Brown Cc: linux-spi@vger.kernel.org --- drivers/spi/spi-pxa2xx-pxadma.c | 1 + include/linux/spi/pxa2xx_spi.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-pxa2xx-pxadma.c b/drivers/spi/spi-pxa2xx-pxadma.c index e8a26f2..e866f2c 100644 --- a/drivers/spi/spi-pxa2xx-pxadma.c +++ b/drivers/spi/spi-pxa2xx-pxadma.c @@ -25,6 +25,7 @@ #include #include +#include #include "spi-pxa2xx.h" #define DMA_INT_MASK (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR) diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h index d5a3165..46d8fa9 100644 --- a/include/linux/spi/pxa2xx_spi.h +++ b/include/linux/spi/pxa2xx_spi.h @@ -57,7 +57,6 @@ struct pxa2xx_spi_chip { #if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP) #include -#include extern void pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info);