From patchwork Fri Nov 28 15:59:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Sakamoto X-Patchwork-Id: 5404621 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 8DAA79F443 for ; Fri, 28 Nov 2014 16:07:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB5E7201C7 for ; Fri, 28 Nov 2014 16:07:12 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 74FC9201C0 for ; Fri, 28 Nov 2014 16:07:11 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6F7B5261518; Fri, 28 Nov 2014 17:07:10 +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 077B52604F7; Fri, 28 Nov 2014 17:00:22 +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 418032604D4; Fri, 28 Nov 2014 17:00:10 +0100 (CET) Received: from smtp303.phy.lolipop.jp (smtp303.phy.lolipop.jp [210.157.22.87]) by alsa0.perex.cz (Postfix) with ESMTP id 714B72604E7 for ; Fri, 28 Nov 2014 16:59:52 +0100 (CET) Received: from smtp303.phy.lolipop.lan (HELO smtp303.phy.lolipop.jp) (172.17.1.87) (smtp-auth username m12129643-o-takashi, mechanism plain) by smtp303.phy.lolipop.jp (qpsmtpd/0.82) with ESMTPA; Sat, 29 Nov 2014 00:59:47 +0900 Received: from 127.0.0.1 (127.0.0.1) by smtp303.phy.lolipop.jp (LOLIPOP-Fsecure); Sat, 29 Nov 2014 00:59:40 +0900 (JST) X-Virus-Status: clean(LOLIPOP-Fsecure) From: Takashi Sakamoto To: clemens@ladisch.de, tiwai@suse.de Date: Sat, 29 Nov 2014 00:59:26 +0900 Message-Id: <1417190379-4172-18-git-send-email-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417190379-4172-1-git-send-email-o-takashi@sakamocchi.jp> References: <1417190379-4172-1-git-send-email-o-takashi@sakamocchi.jp> Cc: alsa-devel@alsa-project.org, ffado-devel@lists.sourceforge.net Subject: [alsa-devel] [PATCH 17/30] ALSA: oxfw: Move to its own directory 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 Followed commits add much codes. To make the work easy, this commit creates own directory and move current file to it. Signed-off-by: Takashi Sakamoto --- sound/firewire/Makefile | 2 +- sound/firewire/oxfw/Makefile | 2 ++ sound/firewire/{ => oxfw}/oxfw.c | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 sound/firewire/oxfw/Makefile rename sound/firewire/{ => oxfw}/oxfw.c (99%) diff --git a/sound/firewire/Makefile b/sound/firewire/Makefile index 5ed6fb7..8b37f08 100644 --- a/sound/firewire/Makefile +++ b/sound/firewire/Makefile @@ -6,7 +6,7 @@ snd-scs1x-objs := scs1x.o obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o obj-$(CONFIG_SND_DICE) += dice/ -obj-$(CONFIG_SND_OXFW) += snd-oxfw.o +obj-$(CONFIG_SND_OXFW) += oxfw/ obj-$(CONFIG_SND_ISIGHT) += snd-isight.o obj-$(CONFIG_SND_SCS1X) += snd-scs1x.o obj-$(CONFIG_SND_FIREWORKS) += fireworks/ diff --git a/sound/firewire/oxfw/Makefile b/sound/firewire/oxfw/Makefile new file mode 100644 index 0000000..9ca49c0 --- /dev/null +++ b/sound/firewire/oxfw/Makefile @@ -0,0 +1,2 @@ +snd-oxfw-objs := oxfw.o +obj-m += snd-oxfw.o diff --git a/sound/firewire/oxfw.c b/sound/firewire/oxfw/oxfw.c similarity index 99% rename from sound/firewire/oxfw.c rename to sound/firewire/oxfw/oxfw.c index b7498e9..55c687e 100644 --- a/sound/firewire/oxfw.c +++ b/sound/firewire/oxfw/oxfw.c @@ -17,10 +17,10 @@ #include #include #include -#include "cmp.h" -#include "fcp.h" -#include "amdtp.h" -#include "lib.h" +#include "../cmp.h" +#include "../fcp.h" +#include "../amdtp.h" +#include "../lib.h" #define OXFORD_FIRMWARE_ID_ADDRESS (CSR_REGISTER_BASE + 0x50000) /* 0x970?vvvv or 0x971?vvvv, where vvvv = firmware version */