diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/soc/mid-x86/Makefile | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/soc/mid-x86/Makefile')
| -rw-r--r-- | sound/soc/mid-x86/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/mid-x86/Makefile b/sound/soc/mid-x86/Makefile new file mode 100644 index 000000000000..639883339465 --- /dev/null +++ b/sound/soc/mid-x86/Makefile | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | snd-soc-sst-platform-objs := sst_platform.o | ||
| 2 | snd-soc-mfld-machine-objs := mfld_machine.o | ||
| 3 | |||
| 4 | obj-$(CONFIG_SND_SST_PLATFORM) += snd-soc-sst-platform.o | ||
| 5 | obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o | ||