commit a09e64fbc0094e3073dbb09c3b4bfe4ab669244b
author Russell King <rmk@dyn-67.arm.linux.org.uk> Tue Aug 05 16:14:15 2008 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Thu Aug 07 09:55:48 2008 +0100
tree 69689f467179891b498bd7423fcf61925173db31
parent a1b81a84fff05dbfef45b7012c26e1fee9973e5d

[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>

sound/oss/vidc.c

diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
index 41cd4f2..725fef0 100644
--- a/sound/oss/vidc.c
+++ b/sound/oss/vidc.c
@@ -22,7 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/hardware/iomd.h>

sound/oss/vidc_fill.S

diff --git a/sound/oss/vidc_fill.S b/sound/oss/vidc_fill.S
index d2cb210..bed3492 100644
--- a/sound/oss/vidc_fill.S
+++ b/sound/oss/vidc_fill.S
@@ -11,7 +11,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/iomd.h>
 
 		.text

sound/oss/waveartist.c

diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index d84c497..c47842f 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -47,7 +47,7 @@
 #include "waveartist.h"
 
 #ifdef CONFIG_ARM
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #endif