Initial Contribution
msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 1dc6de6..87569ed 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2,12 +2,12 @@
* soc-dapm.c -- ALSA SoC Dynamic Audio Power Management
*
* Copyright 2005 Wolfson Microelectronics PLC.
+ *
* Author: Liam Girdwood <lrg@slimlogic.co.uk>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the License.
*
* Features:
* o Changes power status of internal codec blocks depending on the
@@ -1545,7 +1545,6 @@
dapm->dev_power = 1;
break;
case SND_SOC_DAPM_STREAM_STOP:
-#warning need re-work
if (dapm->codec)
dapm->dev_power = !!dapm->codec->active;
else
@@ -3073,4 +3072,4 @@
/* Module information */
MODULE_AUTHOR("Liam Girdwood, lrg@slimlogic.co.uk");
MODULE_DESCRIPTION("Dynamic Audio Power Management core for ALSA SoC");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");