diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-22 02:31:51 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-22 02:31:51 (GMT) |
commit | de0853c000aa3b5c9983d066c137e5dc9c8355a0 (patch) | |
tree | 6e335b5da919c1b9adcf87dfdd6da16c09a99e77 /sound/soc/codecs/tpa6130a2.c | |
parent | 2b39535b9e54888649923beaab443af212b6c0fd (diff) | |
parent | 4a787a3ff3f419c23ab0a5cef677fa441356b818 (diff) | |
download | linux-fsl-qoriq-de0853c000aa3b5c9983d066c137e5dc9c8355a0.tar.xz |
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 'sound/soc/codecs/tpa6130a2.c')
-rw-r--r-- | sound/soc/codecs/tpa6130a2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c index 1f1ac81..239e0c4 100644 --- a/sound/soc/codecs/tpa6130a2.c +++ b/sound/soc/codecs/tpa6130a2.c @@ -3,7 +3,7 @@ * * Copyright (C) Nokia Corporation * - * Author: 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 @@ -495,7 +495,7 @@ static void __exit tpa6130a2_exit(void) i2c_del_driver(&tpa6130a2_i2c_driver); } -MODULE_AUTHOR("Peter Ujfalusi"); +MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>"); MODULE_DESCRIPTION("TPA6130A2 Headphone amplifier driver"); MODULE_LICENSE("GPL"); |