diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-05 11:14:15 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:48 -0400 |
| commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
| tree | 69689f467179891b498bd7423fcf61925173db31 /sound/soc/at91 | |
| parent | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (diff) | |
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'sound/soc/at91')
| -rw-r--r-- | sound/soc/at91/at91-pcm.c | 4 | ||||
| -rw-r--r-- | sound/soc/at91/at91-pcm.h | 2 | ||||
| -rw-r--r-- | sound/soc/at91/at91-ssc.c | 6 | ||||
| -rw-r--r-- | sound/soc/at91/eti_b1_wm8731.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/at91/at91-pcm.c b/sound/soc/at91/at91-pcm.c index d47492b2b6e5..7ab48bd25e4c 100644 --- a/sound/soc/at91/at91-pcm.c +++ b/sound/soc/at91/at91-pcm.c | |||
| @@ -28,8 +28,8 @@ | |||
| 28 | #include <sound/pcm_params.h> | 28 | #include <sound/pcm_params.h> |
| 29 | #include <sound/soc.h> | 29 | #include <sound/soc.h> |
| 30 | 30 | ||
| 31 | #include <asm/arch/hardware.h> | 31 | #include <mach/hardware.h> |
| 32 | #include <asm/arch/at91_ssc.h> | 32 | #include <mach/at91_ssc.h> |
| 33 | 33 | ||
| 34 | #include "at91-pcm.h" | 34 | #include "at91-pcm.h" |
| 35 | 35 | ||
diff --git a/sound/soc/at91/at91-pcm.h b/sound/soc/at91/at91-pcm.h index 58d0f00a07b2..e5aada2cb102 100644 --- a/sound/soc/at91/at91-pcm.h +++ b/sound/soc/at91/at91-pcm.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #ifndef _AT91_PCM_H | 19 | #ifndef _AT91_PCM_H |
| 20 | #define _AT91_PCM_H | 20 | #define _AT91_PCM_H |
| 21 | 21 | ||
| 22 | #include <asm/arch/hardware.h> | 22 | #include <mach/hardware.h> |
| 23 | 23 | ||
| 24 | struct at91_ssc_periph { | 24 | struct at91_ssc_periph { |
| 25 | void __iomem *base; | 25 | void __iomem *base; |
diff --git a/sound/soc/at91/at91-ssc.c b/sound/soc/at91/at91-ssc.c index 090e607f8692..5d44515e62e0 100644 --- a/sound/soc/at91/at91-ssc.c +++ b/sound/soc/at91/at91-ssc.c | |||
| @@ -28,9 +28,9 @@ | |||
| 28 | #include <sound/initval.h> | 28 | #include <sound/initval.h> |
| 29 | #include <sound/soc.h> | 29 | #include <sound/soc.h> |
| 30 | 30 | ||
| 31 | #include <asm/arch/hardware.h> | 31 | #include <mach/hardware.h> |
| 32 | #include <asm/arch/at91_pmc.h> | 32 | #include <mach/at91_pmc.h> |
| 33 | #include <asm/arch/at91_ssc.h> | 33 | #include <mach/at91_ssc.h> |
| 34 | 34 | ||
| 35 | #include "at91-pcm.h" | 35 | #include "at91-pcm.h" |
| 36 | #include "at91-ssc.h" | 36 | #include "at91-ssc.h" |
diff --git a/sound/soc/at91/eti_b1_wm8731.c b/sound/soc/at91/eti_b1_wm8731.c index d61a4537e604..b081e83766b7 100644 --- a/sound/soc/at91/eti_b1_wm8731.c +++ b/sound/soc/at91/eti_b1_wm8731.c | |||
| @@ -33,8 +33,8 @@ | |||
| 33 | #include <sound/soc.h> | 33 | #include <sound/soc.h> |
| 34 | #include <sound/soc-dapm.h> | 34 | #include <sound/soc-dapm.h> |
| 35 | 35 | ||
| 36 | #include <asm/arch/hardware.h> | 36 | #include <mach/hardware.h> |
| 37 | #include <asm/arch/gpio.h> | 37 | #include <mach/gpio.h> |
| 38 | 38 | ||
| 39 | #include "../codecs/wm8731.h" | 39 | #include "../codecs/wm8731.h" |
| 40 | #include "at91-pcm.h" | 40 | #include "at91-pcm.h" |