From patchwork Sun Dec 21 11:18:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 5523821 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 05D97BEEA8 for ; Sun, 21 Dec 2014 11:18:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 30DB120158 for ; Sun, 21 Dec 2014 11:18:32 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id BA5BE2013D for ; Sun, 21 Dec 2014 11:18:30 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 378032605A9; Sun, 21 Dec 2014 12:18:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 9F43D26059D; Sun, 21 Dec 2014 12:18:19 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 95E5A26059E; Sun, 21 Dec 2014 12:18:18 +0100 (CET) Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by alsa0.perex.cz (Postfix) with ESMTP id 6B510260594 for ; Sun, 21 Dec 2014 12:18:12 +0100 (CET) Received: by mail.free-electrons.com (Postfix, from userid 106) id DDA2971A; Sun, 21 Dec 2014 12:18:15 +0100 (CET) Received: from localhost (128-79-216-6.hfc.dyn.abo.bbox.fr [128.79.216.6]) by mail.free-electrons.com (Postfix) with ESMTPSA id A1AFE30A; Sun, 21 Dec 2014 12:18:15 +0100 (CET) From: Alexandre Belloni To: Takashi Iwai Date: Sun, 21 Dec 2014 12:18:09 +0100 Message-Id: <1419160689-20447-1-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.1.0 Cc: alsa-devel@alsa-project.org, Arnd Bergmann , Nicolas Ferre , linux-kernel@vger.kernel.org, alexandre.belloni@free-electrons.com, Alexander Stein , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH v2] ALSA: atmel: fix building the ac97 driver for at91-multiplatform X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Arnd Bergmann at91 will no longer export the mach/cpu.h and mach/hardware.h header files in the future, which would break building the atmel ac97c driver. Since the cpu_is_* check is only used to find out whether we are running on avr32 or arm/at91, we can hardcode that check in the ARM case. Signed-off-by: Arnd Bergmann Link: http://www.spinics.net/lists/arm-kernel/msg382068.html --- sound/atmel/ac97c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index b59427d5a697..83975f8d5947 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -34,10 +34,10 @@ #include #include +#ifdef CONFIG_AVR32 #include - -#ifdef CONFIG_ARCH_AT91 -#include +#else +#define cpu_is_at32ap7000() 0 #endif #include "ac97c.h"