aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@ti.com>2011-07-24 15:59:46 -0400
committerPaolo Pisati <paolo.pisati@canonical.com>2012-08-17 04:18:26 -0400
commit4c35d33e3d6ce44acd484d87464f1b3b18a188bb (patch)
treefdb1535c23fa9c3ab6491f8ad438c65ddaaee21c
parentaea7bfee0c70fa581975dc7805a07752b4d693a8 (diff)
Subject: [PATCH 081/104] ASoC: OMAP4 ABE DAI - Add Makefile support
Signed-off-by: Liam Girdwood <lrg@ti.com>
-rw-r--r--sound/soc/omap/Makefile2
-rw-r--r--sound/soc/omap/omap-abe.c6
-rw-r--r--sound/soc/omap/omap-abe.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
index 4dae532d3a7..cafdbe62bad 100644
--- a/sound/soc/omap/Makefile
+++ b/sound/soc/omap/Makefile
@@ -2,10 +2,12 @@
2snd-soc-omap-objs := omap-pcm.o 2snd-soc-omap-objs := omap-pcm.o
3snd-soc-omap-mcbsp-objs := omap-mcbsp.o 3snd-soc-omap-mcbsp-objs := omap-mcbsp.o
4snd-soc-omap-mcpdm-objs := omap-mcpdm.o 4snd-soc-omap-mcpdm-objs := omap-mcpdm.o
5snd-soc-omap-abe-objs := omap-abe.o
5 6
6obj-$(CONFIG_SND_OMAP_SOC) += snd-soc-omap.o 7obj-$(CONFIG_SND_OMAP_SOC) += snd-soc-omap.o
7obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o 8obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o
8obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o 9obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o
10obj-$(CONFIG_SND_OMAP_SOC_ABE) += snd-soc-omap-abe.o
9 11
10# OMAP Machine Support 12# OMAP Machine Support
11snd-soc-n810-objs := n810.o 13snd-soc-n810-objs := n810.o
diff --git a/sound/soc/omap/omap-abe.c b/sound/soc/omap/omap-abe.c
index 258dfb482a0..3415efe22f8 100644
--- a/sound/soc/omap/omap-abe.c
+++ b/sound/soc/omap/omap-abe.c
@@ -3,7 +3,9 @@
3 * 3 *
4 * Copyright (C) 2010 Texas Instruments 4 * Copyright (C) 2010 Texas Instruments
5 * 5 *
6 * Contact: Liam Girdwood <lrg@slimlogic.co.uk> 6 * Contact: Liam Girdwood <lrg@ti.com>
7 * Misael Lopez Cruz <misael.lopez@ti.com>
8 * Sebastien Guiriec <s-guiriec@ti.com>
7 * 9 *
8 * This program is free software; you can redistribute it and/or 10 * This program is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU General Public License 11 * modify it under the terms of the GNU General Public License
@@ -1238,6 +1240,6 @@ static void __exit omap_abe_exit(void)
1238} 1240}
1239module_exit(omap_abe_exit); 1241module_exit(omap_abe_exit);
1240 1242
1241MODULE_AUTHOR("Liam Girdwood <lrg@slimlogic.co.uk>"); 1243MODULE_AUTHOR("Liam Girdwood <lrg@ti.com>");
1242MODULE_DESCRIPTION("OMAP ABE SoC Interface"); 1244MODULE_DESCRIPTION("OMAP ABE SoC Interface");
1243MODULE_LICENSE("GPL"); 1245MODULE_LICENSE("GPL");
diff --git a/sound/soc/omap/omap-abe.h b/sound/soc/omap/omap-abe.h
index 92875882bcf..f6fad970df6 100644
--- a/sound/soc/omap/omap-abe.h
+++ b/sound/soc/omap/omap-abe.h
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2010 Texas Instruments 4 * Copyright (C) 2010 Texas Instruments
5 * 5 *
6 * Contact: Liam Girdwood <lrg@slimlogic.co.uk> 6 * Contact: Liam Girdwood <lrg@ti.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or 8 * This program is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU General Public License 9 * modify it under the terms of the GNU General Public License