diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-09-30 15:45:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-30 15:45:52 +0200 |
| commit | 22fcba621d8ffabf919c2468d32c0044829386ae (patch) | |
| tree | 48644641973b668351dbd769733349fd90fdf8a3 | |
| parent | d1f08b5a6968a22e5b229aee9c75408f964ce432 (diff) | |
| parent | 2959dde21d3bce32f5c0713136f9f58c39052ae3 (diff) | |
| download | alsa-driver-build-unstable-22fcba621d8ffabf919c2468d32c0044829386ae.tar.gz | |
Merge remote-tracking branch 'stable/build' into build
| -rw-r--r-- | alsa/firewire/digi00x/Makefile | 12 | ||||
| -rw-r--r-- | alsa/firewire/digi00x/amdtp-dot.c | 2 | ||||
| -rw-r--r-- | alsa/firewire/digi00x/digi00x-hwdep.c | 2 | ||||
| -rw-r--r-- | alsa/firewire/digi00x/digi00x-pcm.c | 2 | ||||
| -rw-r--r-- | alsa/firewire/digi00x/digi00x-proc.c | 2 | ||||
| -rw-r--r-- | alsa/firewire/digi00x/digi00x-stream.c | 2 | ||||
| -rw-r--r-- | alsa/firewire/digi00x/digi00x-transaction.c | 2 | ||||
| -rw-r--r-- | alsa/firewire/digi00x/digi00x.c | 2 | ||||
| -rw-r--r-- | alsa/kconfig-vers | 1 |
9 files changed, 27 insertions, 0 deletions
diff --git a/alsa/firewire/digi00x/Makefile b/alsa/firewire/digi00x/Makefile new file mode 100644 index 000000000..070490f06 --- /dev/null +++ b/alsa/firewire/digi00x/Makefile @@ -0,0 +1,12 @@ +ifndef SND_TOPDIR +SND_TOPDIR=../.. +endif + +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf + +include $(SND_TOPDIR)/alsa-kernel/firewire/digi00x/Makefile + +EXTRA_CFLAGS += -I$(SND_TOPDIR)/alsa-kernel/firewire + +include $(SND_TOPDIR)/Rules.make diff --git a/alsa/firewire/digi00x/amdtp-dot.c b/alsa/firewire/digi00x/amdtp-dot.c new file mode 100644 index 000000000..6023eed4c --- /dev/null +++ b/alsa/firewire/digi00x/amdtp-dot.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/firewire/digi00x/amdtp-dot.c" diff --git a/alsa/firewire/digi00x/digi00x-hwdep.c b/alsa/firewire/digi00x/digi00x-hwdep.c new file mode 100644 index 000000000..b5e1b3fff --- /dev/null +++ b/alsa/firewire/digi00x/digi00x-hwdep.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/firewire/digi00x/digi00x-hwdep.c" diff --git a/alsa/firewire/digi00x/digi00x-pcm.c b/alsa/firewire/digi00x/digi00x-pcm.c new file mode 100644 index 000000000..3a5941391 --- /dev/null +++ b/alsa/firewire/digi00x/digi00x-pcm.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/firewire/digi00x/digi00x-pcm.c" diff --git a/alsa/firewire/digi00x/digi00x-proc.c b/alsa/firewire/digi00x/digi00x-proc.c new file mode 100644 index 000000000..7fbf30d69 --- /dev/null +++ b/alsa/firewire/digi00x/digi00x-proc.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/firewire/digi00x/digi00x-proc.c" diff --git a/alsa/firewire/digi00x/digi00x-stream.c b/alsa/firewire/digi00x/digi00x-stream.c new file mode 100644 index 000000000..e3d3c9a3b --- /dev/null +++ b/alsa/firewire/digi00x/digi00x-stream.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/firewire/digi00x/digi00x-stream.c" diff --git a/alsa/firewire/digi00x/digi00x-transaction.c b/alsa/firewire/digi00x/digi00x-transaction.c new file mode 100644 index 000000000..ed73e4403 --- /dev/null +++ b/alsa/firewire/digi00x/digi00x-transaction.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/firewire/digi00x/digi00x-transaction.c" diff --git a/alsa/firewire/digi00x/digi00x.c b/alsa/firewire/digi00x/digi00x.c new file mode 100644 index 000000000..593372f0b --- /dev/null +++ b/alsa/firewire/digi00x/digi00x.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/firewire/digi00x/digi00x.c" diff --git a/alsa/kconfig-vers b/alsa/kconfig-vers index ca374119b..281532929 100644 --- a/alsa/kconfig-vers +++ b/alsa/kconfig-vers @@ -26,3 +26,4 @@ SND_COMPRESS_OFFLOAD 3.0 SND_USB_USX2Y 2.6.24 SND_BEBOB 3.11 SND_FIREWORKS 3.11 +SND_FIREWIRE_DIGI00X 3.11 |