ASoC: SAMSUNG: Remove AC97 header file
authorSeungwhan Youn <sw.youn@samsung.com>
Fri, 7 Jan 2011 04:46:52 +0000 (13:46 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 10 Jan 2011 11:38:00 +0000 (11:38 +0000)
This patch moves AC97 specific definitions, they doesn't need to be shared,
into 'ac97.c' from 'ac97.h'. This patch also remove header file, 'ac97.h',
and remove includes on machine drivers.

Signed-off-by: Seungwhan Youn <sw.youn@samsung.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/samsung/ac97.c
sound/soc/samsung/ac97.h [deleted file]
sound/soc/samsung/ln2440sbc_alc650.c
sound/soc/samsung/smdk2443_wm9710.c
sound/soc/samsung/smdk_wm9713.c

index 4770a9550341a3c5cf86781ea7505254ce045855..1e84ee01eaca81ee629e3cece447d5225fa32894 100644 (file)
 #include <plat/audio.h>
 
 #include "dma.h"
-#include "ac97.h"
 
 #define AC_CMD_ADDR(x) (x << 16)
 #define AC_CMD_DATA(x) (x & 0xffff)
 
+#define S3C_AC97_DAI_PCM 0
+#define S3C_AC97_DAI_MIC 1
+
 struct s3c_ac97_info {
        struct clk         *ac97_clk;
        void __iomem       *regs;
diff --git a/sound/soc/samsung/ac97.h b/sound/soc/samsung/ac97.h
deleted file mode 100644 (file)
index 0d0e1b5..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* sound/soc/samsung/ac97.h
- *
- * ALSA SoC Audio Layer - S3C AC97 Controller driver
- *     Evolved from s3c2443-ac97.h
- *
- * Copyright (c) 2010 Samsung Electronics Co. Ltd
- *     Author: Jaswinder Singh <jassi.brar@samsung.com>
- *     Credits: Graeme Gregory, Sean Choi
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __S3C_AC97_H_
-#define __S3C_AC97_H_
-
-#define S3C_AC97_DAI_PCM 0
-#define S3C_AC97_DAI_MIC 1
-
-#endif /* __S3C_AC97_H_ */
index a2bb34def740e1968d69a39da1cd7a39a4ef1a1e..02414290169bd12f8d3e2cee137a46b2cf12029d 100644 (file)
@@ -23,7 +23,6 @@
 #include <sound/soc.h>
 
 #include "dma.h"
-#include "ac97.h"
 
 static struct snd_soc_card ln2440sbc;
 
index 3be7e7e92d6e0ed6be3e25c9a6eefbf333c818dc..4bd8c0b639667ab4b3a4fceb6f6cb150c1c8b82e 100644 (file)
@@ -19,7 +19,6 @@
 #include <sound/soc.h>
 
 #include "dma.h"
-#include "ac97.h"
 
 static struct snd_soc_card smdk2443;
 
index ae5fed6f772f6b26af2cc90677df58d41caa9c57..d58d86e7e19d341546b3ce74ea3819e3aaba7bc3 100644 (file)
@@ -16,7 +16,6 @@
 #include <sound/soc.h>
 
 #include "dma.h"
-#include "ac97.h"
 
 static struct snd_soc_card smdk;