summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 14:08:03 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 14:08:03 +0000
commitde7ba0574e5f771bb56ce3c075b9975d9d2ba0f6 (patch)
tree4ee4f92476657a92e6228b13a6fffb27c4d25f06
parentd7963b72e4f7c41f741dbf75003f9ca23eac6512 (diff)
parent4480764f57ba494e3f64003e13223c0b5ec6a2ca (diff)
downloadlinux-de7ba0574e5f771bb56ce3c075b9975d9d2ba0f6.tar.bz2
Merge remote-tracking branch 'asoc/fix/max98090' into asoc-next
-rw-r--r--[-rwxr-xr-x]include/sound/max98090.h0
-rw-r--r--[-rwxr-xr-x]sound/soc/codecs/max98090.c0
-rw-r--r--[-rwxr-xr-x]sound/soc/codecs/max98090.h0
3 files changed, 0 insertions, 0 deletions
diff --git a/include/sound/max98090.h b/include/sound/max98090.h
index 95efb13f8478..95efb13f8478 100755..100644
--- a/include/sound/max98090.h
+++ b/include/sound/max98090.h
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index fc176044994d..fc176044994d 100755..100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
diff --git a/sound/soc/codecs/max98090.h b/sound/soc/codecs/max98090.h
index 7e103f249053..7e103f249053 100755..100644
--- a/sound/soc/codecs/max98090.h
+++ b/sound/soc/codecs/max98090.h