diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-21 07:42:49 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-21 07:42:49 +0200 |
| commit | f22d806b6cc0c74dd0a1a21b3f311dba51d9df84 (patch) | |
| tree | dcc11baa299cb60a8aa06e909ab1ef847ec2a85f /sound/soc/omap/omap-mcbsp.h | |
| parent | 9bc5df222b9cfc4be1176e566dfba2ab5c6b43f8 (diff) | |
| parent | 516ef69f160fb2f092d71f2cb635a9394ff8a71a (diff) | |
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/omap-mcbsp.h')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h index df7ad13ba73d..c8147aace813 100644 --- a/sound/soc/omap/omap-mcbsp.h +++ b/sound/soc/omap/omap-mcbsp.h @@ -3,7 +3,8 @@ * * Copyright (C) 2008 Nokia Corporation * - * Contact: Jarkko Nikula <jarkko.nikula@nokia.com> + * Contact: Jarkko Nikula <jhnikula@gmail.com> + * Peter Ujfalusi <peter.ujfalusi@nokia.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License |