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/oss | |
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/oss')
-rw-r--r-- | sound/oss/vidc.c | 2 | ||||
-rw-r--r-- | sound/oss/vidc_fill.S | 2 | ||||
-rw-r--r-- | sound/oss/waveartist.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index 41cd4f25de04..725fef0f59a3 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
24 | 24 | ||
25 | #include <asm/arch/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <asm/dma.h> | 26 | #include <asm/dma.h> |
27 | #include <asm/io.h> | 27 | #include <asm/io.h> |
28 | #include <asm/hardware/iomd.h> | 28 | #include <asm/hardware/iomd.h> |
diff --git a/sound/oss/vidc_fill.S b/sound/oss/vidc_fill.S index d2cb210cc402..bed34921d176 100644 --- a/sound/oss/vidc_fill.S +++ b/sound/oss/vidc_fill.S | |||
@@ -11,7 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
13 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
14 | #include <asm/arch/hardware.h> | 14 | #include <mach/hardware.h> |
15 | #include <asm/hardware/iomd.h> | 15 | #include <asm/hardware/iomd.h> |
16 | 16 | ||
17 | .text | 17 | .text |
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index d84c49787f6f..c47842fad657 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include "waveartist.h" | 47 | #include "waveartist.h" |
48 | 48 | ||
49 | #ifdef CONFIG_ARM | 49 | #ifdef CONFIG_ARM |
50 | #include <asm/arch/hardware.h> | 50 | #include <mach/hardware.h> |
51 | #include <asm/mach-types.h> | 51 | #include <asm/mach-types.h> |
52 | #endif | 52 | #endif |
53 | 53 | ||