summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-22 10:31:51 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-22 10:31:51 +0800
commitde0853c000aa3b5c9983d066c137e5dc9c8355a0 (patch)
tree6e335b5da919c1b9adcf87dfdd6da16c09a99e77 /include/sound
parent2b39535b9e54888649923beaab443af212b6c0fd (diff)
parent4a787a3ff3f419c23ab0a5cef677fa441356b818 (diff)
downloadop-kernel-dev-de0853c000aa3b5c9983d066c137e5dc9c8355a0.zip
op-kernel-dev-de0853c000aa3b5c9983d066c137e5dc9c8355a0.tar.gz
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.40
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/tlv320dac33-plat.h2
-rw-r--r--include/sound/tpa6130a2-plat.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/tlv320dac33-plat.h b/include/sound/tlv320dac33-plat.h
index 6c66496..0b94192 100644
--- a/include/sound/tlv320dac33-plat.h
+++ b/include/sound/tlv320dac33-plat.h
@@ -1,7 +1,7 @@
/*
* Platform header for Texas Instruments TLV320DAC33 codec driver
*
- * Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
+ * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
*
* Copyright: (C) 2009 Nokia Corporation
*
diff --git a/include/sound/tpa6130a2-plat.h b/include/sound/tpa6130a2-plat.h
index e29fde6..89beccb5 100644
--- a/include/sound/tpa6130a2-plat.h
+++ b/include/sound/tpa6130a2-plat.h
@@ -3,7 +3,7 @@
*
* Copyright (C) Nokia Corporation
*
- * Written by Peter Ujfalusi <peter.ujfalusi@nokia.com>
+ * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
OpenPOWER on IntegriCloud