summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/n810.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-21 07:42:49 +0200
committerTakashi Iwai <tiwai@suse.de>2009-04-21 07:42:49 +0200
commitf22d806b6cc0c74dd0a1a21b3f311dba51d9df84 (patch)
treedcc11baa299cb60a8aa06e909ab1ef847ec2a85f /sound/soc/omap/n810.c
parent9bc5df222b9cfc4be1176e566dfba2ab5c6b43f8 (diff)
parent516ef69f160fb2f092d71f2cb635a9394ff8a71a (diff)
downloadop-kernel-dev-f22d806b6cc0c74dd0a1a21b3f311dba51d9df84.zip
op-kernel-dev-f22d806b6cc0c74dd0a1a21b3f311dba51d9df84.tar.gz
Merge branch 'fix/asoc' into for-linus
* fix/asoc: ASoC: Fix warning in wm9705 ASoC: OMAP: Update contact addresses ASoC: pxa-ssp: Don't use SSCR0_SerClkDiv and SSCR0_SCR
Diffstat (limited to 'sound/soc/omap/n810.c')
-rw-r--r--sound/soc/omap/n810.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index a6d1178..91ef179 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2008 Nokia Corporation
*
- * Contact: Jarkko Nikula <jarkko.nikula@nokia.com>
+ * Contact: Jarkko Nikula <jhnikula@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -417,6 +417,6 @@ static void __exit n810_soc_exit(void)
module_init(n810_soc_init);
module_exit(n810_soc_exit);
-MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");
+MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");
MODULE_DESCRIPTION("ALSA SoC Nokia N810");
MODULE_LICENSE("GPL");
OpenPOWER on IntegriCloud