alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Mack <daniel@caiaq.de>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, clemens@ladisch.de
Subject: [PATCH 1/8] ALSA: usb-audio: move ua101 driver
Date: Fri,  5 Mar 2010 08:41:18 +0100	[thread overview]
Message-ID: <1267774885-16266-2-git-send-email-daniel@caiaq.de> (raw)
In-Reply-To: <1267774885-16266-1-git-send-email-daniel@caiaq.de>

As part of the USB audio code cleanup, move the non-standard ua101
driver out of the way.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: Takashi Iwai <tiwai@suse.de>
---
 sound/usb/Makefile           |    5 ++---
 sound/usb/misc/Makefile      |    2 ++
 sound/usb/{ => misc}/ua101.c |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 sound/usb/misc/Makefile
 rename sound/usb/{ => misc}/ua101.c (99%)

diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 5bf64ae..b0e5597 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -4,12 +4,11 @@
 
 snd-usb-audio-objs := usbaudio.o usbmixer.o
 snd-usb-lib-objs := usbmidi.o
-snd-ua101-objs := ua101.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usb-lib.o
-obj-$(CONFIG_SND_USB_UA101) += snd-ua101.o snd-usb-lib.o
+obj-$(CONFIG_SND_USB_UA101) += snd-usb-lib.o
 obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-lib.o
 obj-$(CONFIG_SND_USB_US122L) += snd-usb-lib.o
 
-obj-$(CONFIG_SND) += usx2y/ caiaq/
+obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/
diff --git a/sound/usb/misc/Makefile b/sound/usb/misc/Makefile
new file mode 100644
index 0000000..ccefd81
--- /dev/null
+++ b/sound/usb/misc/Makefile
@@ -0,0 +1,2 @@
+snd-ua101-objs := ua101.o
+obj-$(CONFIG_SND_USB_UA101) += snd-ua101.o
diff --git a/sound/usb/ua101.c b/sound/usb/misc/ua101.c
similarity index 99%
rename from sound/usb/ua101.c
rename to sound/usb/misc/ua101.c
index 3d458d3..e9b0ae5 100644
--- a/sound/usb/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -23,7 +23,7 @@
 #include <sound/initval.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
-#include "usbaudio.h"
+#include "../usbaudio.h"
 
 MODULE_DESCRIPTION("Edirol UA-101/1000 driver");
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
-- 
1.6.6.2

  reply	other threads:[~2010-03-05  7:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-05  7:41 usb-audio code refactoring, more v2 support [resend] Daniel Mack
2010-03-05  7:41 ` Daniel Mack [this message]
2010-03-05  7:41   ` [PATCH 2/8] ALSA: usb-audio: header file cleanups Daniel Mack
     [not found]     ` <1267774885-16266-4-git-send-email-daniel@caiaq.de>
2010-03-05  7:41       ` [PATCH 4/8] ALSA: usb-audio: rename substream format field to altset_idx Daniel Mack
2010-03-05  7:41         ` [PATCH 5/8] ALSA: usb-audio: use a format bitmask per alternate setting Daniel Mack
2010-03-05  7:41           ` [PATCH 6/8] ALSA: usb-audio: support multiple formats with audio class v2 devices Daniel Mack
2010-03-05  7:41             ` [PATCH 7/8] ALSA: usb-audio: add support for samplerate setting on " Daniel Mack
2010-03-05  7:41               ` [PATCH 8/8] usb/audio.h: Fix field order Daniel Mack
2010-03-05  7:52 ` usb-audio code refactoring, more v2 support [resend] Daniel Mack

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1267774885-16266-2-git-send-email-daniel@caiaq.de \
    --to=daniel@caiaq.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=clemens@ladisch.de \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).