diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-12 12:26:38 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-12 12:26:38 -0400 |
| commit | c012cdc858db36ff2314469930bfcfb00eef6f29 (patch) | |
| tree | 6038ccd1dec55f82642f6036a75af57cb6b2a921 /include | |
| parent | 15439bde3af7ff88459ea2b5520b77312e958df2 (diff) | |
| parent | f6b864a9071e21186476910613ec9913b56067a2 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/tlv320aic3x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/tlv320aic3x.h b/include/sound/tlv320aic3x.h index 99e0308bf2c2..ffd9bc793105 100644 --- a/include/sound/tlv320aic3x.h +++ b/include/sound/tlv320aic3x.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Platform data for Texas Instruments TLV320AIC3x codec | 2 | * Platform data for Texas Instruments TLV320AIC3x codec |
| 3 | * | 3 | * |
| 4 | * Author: Jarkko Nikula <jhnikula@gmail.com> | 4 | * Author: Jarkko Nikula <jarkko.nikula@bitmer.com> |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |