diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-05 21:34:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-05 21:34:41 +0100 |
| commit | 98500ba2b5f7d321476db39edb0e277939070b4c (patch) | |
| tree | 26cf159dd240d37b46fdafc5fe585aeabf962a74 | |
| parent | 68866eabe455ea52d45014d48129c1f78643a189 (diff) | |
| parent | afca7b17d40e10620dff1745f4704674c53454d3 (diff) | |
| download | alsa-driver-build-unstable-98500ba2b5f7d321476db39edb0e277939070b4c.tar.gz | |
Merge remote-tracking branch 'stable/build' into build
| -rw-r--r-- | alsa/soc/xtensa/Makefile | 10 | ||||
| -rw-r--r-- | alsa/soc/xtensa/xtfpga-i2s.c | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/alsa/soc/xtensa/Makefile b/alsa/soc/xtensa/Makefile new file mode 100644 index 000000000..2269af827 --- /dev/null +++ b/alsa/soc/xtensa/Makefile @@ -0,0 +1,10 @@ +ifndef SND_TOPDIR +SND_TOPDIR=../.. +endif + +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf + +include $(SND_TOPDIR)/alsa-kernel/soc/xtensa/Makefile + +include $(SND_TOPDIR)/Rules.make diff --git a/alsa/soc/xtensa/xtfpga-i2s.c b/alsa/soc/xtensa/xtfpga-i2s.c new file mode 100644 index 000000000..3c1f53b74 --- /dev/null +++ b/alsa/soc/xtensa/xtfpga-i2s.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/soc/xtensa/xtfpga-i2s.c" |