From c47e0d92d74b151e68f08ce2c3014717821c55a7 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben@simtec.co.uk>
Date: Wed, 4 Mar 2009 00:49:28 +0000
Subject: [PATCH] --- yaml --- r: 132876 b: refs/heads/master c:
 899e6cf5e6d83a91d2e257f7a4e8ca98db3831cc h: refs/heads/master v: v3

---
 [refs]                                                          | 2 +-
 .../include/mach => plat-s3c/include/plat}/audio.h              | 0
 trunk/sound/soc/s3c24xx/neo1973_wm8753.c                        | 2 +-
 trunk/sound/soc/s3c24xx/s3c2412-i2s.c                           | 2 +-
 trunk/sound/soc/s3c24xx/s3c2443-ac97.c                          | 2 +-
 trunk/sound/soc/s3c24xx/s3c24xx-i2s.c                           | 2 +-
 trunk/sound/soc/s3c24xx/s3c24xx-pcm.c                           | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename trunk/arch/arm/{mach-s3c2410/include/mach => plat-s3c/include/plat}/audio.h (100%)

diff --git a/[refs] b/[refs]
index f5011cad8f59..dba9c2fdbdc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8150bc886be5ce3cc301a2baca1fcf2cf7bd7f39
+refs/heads/master: 899e6cf5e6d83a91d2e257f7a4e8ca98db3831cc
diff --git a/trunk/arch/arm/mach-s3c2410/include/mach/audio.h b/trunk/arch/arm/plat-s3c/include/plat/audio.h
similarity index 100%
rename from trunk/arch/arm/mach-s3c2410/include/mach/audio.h
rename to trunk/arch/arm/plat-s3c/include/plat/audio.h
diff --git a/trunk/sound/soc/s3c24xx/neo1973_wm8753.c b/trunk/sound/soc/s3c24xx/neo1973_wm8753.c
index 286ff4497fd8..40530fc7fbad 100644
--- a/trunk/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/trunk/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -29,7 +29,7 @@
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 #include <mach/hardware.h>
-#include <mach/audio.h>
+#include <plat/audio.h>
 #include <linux/io.h>
 #include <mach/spi-gpio.h>
 
diff --git a/trunk/sound/soc/s3c24xx/s3c2412-i2s.c b/trunk/sound/soc/s3c24xx/s3c2412-i2s.c
index 36b927d3f54a..3297698ff294 100644
--- a/trunk/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/trunk/sound/soc/s3c24xx/s3c2412-i2s.c
@@ -34,7 +34,7 @@
 #include <plat/regs-s3c2412-iis.h>
 
 #include <mach/regs-gpio.h>
-#include <mach/audio.h>
+#include <plat/audio.h>
 #include <mach/dma.h>
 
 #include "s3c24xx-pcm.h"
diff --git a/trunk/sound/soc/s3c24xx/s3c2443-ac97.c b/trunk/sound/soc/s3c24xx/s3c2443-ac97.c
index 5822d2dd49ba..5c7f18a22645 100644
--- a/trunk/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/trunk/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -31,7 +31,7 @@
 #include <plat/regs-ac97.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-clock.h>
-#include <mach/audio.h>
+#include <plat/audio.h>
 #include <asm/dma.h>
 #include <mach/dma.h>
 
diff --git a/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c b/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c
index 2569b910b9b2..a7312e4fe4a1 100644
--- a/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c
@@ -30,7 +30,7 @@
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-clock.h>
-#include <mach/audio.h>
+#include <plat/audio.h>
 #include <asm/dma.h>
 #include <mach/dma.h>
 
diff --git a/trunk/sound/soc/s3c24xx/s3c24xx-pcm.c b/trunk/sound/soc/s3c24xx/s3c24xx-pcm.c
index 7c64d31d067e..bfea13f3ba73 100644
--- a/trunk/sound/soc/s3c24xx/s3c24xx-pcm.c
+++ b/trunk/sound/soc/s3c24xx/s3c24xx-pcm.c
@@ -29,7 +29,7 @@
 #include <asm/dma.h>
 #include <mach/hardware.h>
 #include <mach/dma.h>
-#include <mach/audio.h>
+#include <plat/audio.h>
 
 #include "s3c24xx-pcm.h"