S3C: Move <mach/audio.h> to <plat/audio.h>

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Thursday, March 26, 2009 - 12:09 pm

Gitweb:     http://git.kernel.org/linus/899e6cf5e6d83a91d2e257f7a4e8ca98db3831cc
Commit:     899e6cf5e6d83a91d2e257f7a4e8ca98db3831cc
Parent:     8150bc886be5ce3cc301a2baca1fcf2cf7bd7f39
Author:     Ben Dooks <ben@simtec.co.uk>
AuthorDate: Wed Mar 4 00:49:28 2009 +0000
Committer:  Mark Brown <broonie@opensource.wolfsonmicro.com>
CommitDate: Thu Mar 5 12:01:00 2009 +0000

    S3C: Move <mach/audio.h> to <plat/audio.h>
    
    The <mach/audio.h> file needs to be common to both ARCH_S3C2410 and
    ARCH_S3C64XX as they share common driver code, so move it to <plat/audio.h>.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 .../include/mach => plat-s3c/include/plat}/audio.h |    0
 sound/soc/s3c24xx/neo1973_wm8753.c                 |    2 +-
 sound/soc/s3c24xx/s3c2412-i2s.c                    |    2 +-
 sound/soc/s3c24xx/s3c2443-ac97.c                   |    2 +-
 sound/soc/s3c24xx/s3c24xx-i2s.c                    |    2 +-
 sound/soc/s3c24xx/s3c24xx-pcm.c                    |    2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-s3c2410/include/mach/audio.h b/arch/arm/plat-s3c/include/plat/audio.h
similarity index 100%
rename from arch/arm/mach-s3c2410/include/mach/audio.h
rename to arch/arm/plat-s3c/include/plat/audio.h
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index 286ff44..40530fc 100644
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/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/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c
index 36b927d..3297698 100644
--- a/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/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/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 5822d2d..5c7f18a 100644
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/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/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
index 2569b91..a7312e4 100644
--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/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/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
index 7c64d31..bfea13f 100644
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
+++ b/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"
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
S3C: Move <mach/audio.h> to <plat/audio.h>, Linux Kernel Mailing ..., (Thu Mar 26, 12:09 pm)