diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:49:34 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:49:34 +0100 |
| commit | d95c3578120e5bc4784069439f00ccb1b5f87717 (patch) | |
| tree | c819de31de3983f3d69f223ede07667ff23bf7da /sound/soc/atmel | |
| parent | ba1d755a36f66101aa88ac9ebb54694def6ec38d (diff) | |
| parent | 78b020d035074fc3aa4d017353bb2c32e2aff56f (diff) | |
Merge branch 'x86/core' into cpus4096
Diffstat (limited to 'sound/soc/atmel')
| -rw-r--r-- | sound/soc/atmel/atmel-pcm.c | 2 | ||||
| -rw-r--r-- | sound/soc/atmel/atmel_ssc_dai.c | 2 | ||||
| -rw-r--r-- | sound/soc/atmel/atmel_ssc_dai.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c index 1fac5efd285b..3dcdc4e3cfa0 100644 --- a/sound/soc/atmel/atmel-pcm.c +++ b/sound/soc/atmel/atmel-pcm.c @@ -44,8 +44,6 @@ #include <sound/pcm_params.h> #include <sound/soc.h> -#include <mach/hardware.h> - #include "atmel-pcm.h" 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 @@ * Based on at91-ssc.c by * Frank Mandarino <fmandarino@endrelia.com> * Based on pxa2xx Platform drivers by - * Liam Girdwood <liam.girdwood@wolfsonmicro.com> + * Liam Girdwood <lrg@slimlogic.co.uk> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/sound/soc/atmel/atmel_ssc_dai.h b/sound/soc/atmel/atmel_ssc_dai.h index a828746e8a2f..391135f9c6c1 100644 --- a/sound/soc/atmel/atmel_ssc_dai.h +++ b/sound/soc/atmel/atmel_ssc_dai.h @@ -10,7 +10,7 @@ * Based on at91-ssc.c by * Frank Mandarino <fmandarino@endrelia.com> * Based on pxa2xx Platform drivers by - * Liam Girdwood <liam.girdwood@wolfsonmicro.com> + * Liam Girdwood <lrg@slimlogic.co.uk> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |