diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-20 09:25:32 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-20 09:25:32 (GMT) |
commit | 4a787a3ff3f419c23ab0a5cef677fa441356b818 (patch) | |
tree | bc806899cc9038a6fa6abb16731eb2e4371a3b44 /sound/soc/codecs/tpa6130a2.c | |
parent | a0c8326397262f1817ee6c5212ad6adf43e3df36 (diff) | |
parent | d491297752c3a36f6cfabd4cd578c0cfa2098044 (diff) | |
download | linux-4a787a3ff3f419c23ab0a5cef677fa441356b818.tar.xz |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
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"); |