From patchwork Mon Mar 10 20:20:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 3805661 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A34EB9F1CD for ; Mon, 10 Mar 2014 20:21:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D386C201DD for ; Mon, 10 Mar 2014 20:21:36 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 09337202FF for ; Mon, 10 Mar 2014 20:21:24 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D60752607C8; Mon, 10 Mar 2014 21:21:21 +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 710612602F3; Mon, 10 Mar 2014 21:21:12 +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 36D72260307; Mon, 10 Mar 2014 21:21:11 +0100 (CET) Received: from andre.telenet-ops.be (andre.telenet-ops.be [195.130.132.53]) by alsa0.perex.cz (Postfix) with ESMTP id 6D0CA2602AD for ; Mon, 10 Mar 2014 21:21:02 +0100 (CET) Received: from ayla.of.borg ([84.193.72.141]) by andre.telenet-ops.be with bizsmtp id bwLv1n00Y32ts5g01wLvHk; Mon, 10 Mar 2014 21:21:00 +0100 Received: from geert by ayla.of.borg with local (Exim 4.76) (envelope-from ) id 1WN6gx-0004uM-FM; Mon, 10 Mar 2014 21:20:55 +0100 From: Geert Uytterhoeven To: Jaroslav Kysela , Takashi Iwai Date: Mon, 10 Mar 2014 21:20:55 +0100 Message-Id: <1394482855-18836-1-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.9.5 Cc: linux-kernel@vger.kernel.org, Nobuhiro Iwamatsu , Geert Uytterhoeven , alsa-devel@alsa-project.org, linux-sh@vger.kernel.org Subject: [alsa-devel] [PATCH] Revert "ALSA: emu10k1: Fix warning: "CCR" redefined" 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 This reverts commit 83fc3bc09518d42e8f5073e2a65884701dfadf19. sh-specific "CCR" and "CCR2" have been prefixed by "SH_" in commit a5f6ea29f9a918403629f8369ae55fac6b09cb53 ('sh: prefix sh-specific "CCR" and "CCR2" by "SH_"'). Signed-off-by: Geert Uytterhoeven --- include/sound/emu10k1.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index dfb42ca6d043..c46908c1bb3f 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -436,8 +436,6 @@ #define CCCA_CURRADDR_MASK 0x00ffffff /* Current address of the selected channel */ #define CCCA_CURRADDR 0x18000008 -/* undefine CCR to avoid conflict with the definition for SH */ -#undef CCR #define CCR 0x09 /* Cache control register */ #define CCR_CACHEINVALIDSIZE 0x07190009 #define CCR_CACHEINVALIDSIZE_MASK 0xfe000000 /* Number of invalid samples cache for this channel */