diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-04 12:19:11 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-04 12:19:11 -0500 |
commit | 7df0eb424d7f5bfb948c921500e0470f4a27c4cb (patch) | |
tree | 9b598439ee962adf627b5138f3fec71375833963 /sound/soc/atmel/atmel_ssc_dai.c | |
parent | af7af690397296b663c8bc152a5f79f32abcef24 (diff) | |
parent | 64ca0404eed57f6c92290d55e949a7f46cbe4bf4 (diff) |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/atmel/atmel_ssc_dai.c')
-rw-r--r-- | sound/soc/atmel/atmel_ssc_dai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index c5d67900d666..ff0054b76502 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * Based on at91-ssc.c by | 10 | * Based on at91-ssc.c by |
11 | * Frank Mandarino <fmandarino@endrelia.com> | 11 | * Frank Mandarino <fmandarino@endrelia.com> |
12 | * Based on pxa2xx Platform drivers by | 12 | * Based on pxa2xx Platform drivers by |
13 | * Liam Girdwood <liam.girdwood@wolfsonmicro.com> | 13 | * Liam Girdwood <lrg@slimlogic.co.uk> |
14 | * | 14 | * |
15 | * This program is free software; you can redistribute it and/or modify | 15 | * This program is free software; you can redistribute it and/or modify |
16 | * it under the terms of the GNU General Public License as published by | 16 | * it under the terms of the GNU General Public License as published by |