diff options
-rw-r--r-- | sound/soc/codecs/stac9766.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/stac9766.h | 12 | ||||
-rw-r--r-- | sound/soc/fsl/efika-audio-fabric.c | 1 |
3 files changed, 4 insertions, 15 deletions
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index e54e4a4ce296..f675d343b529 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c | |||
@@ -26,11 +26,13 @@ | |||
26 | #include <sound/soc.h> | 26 | #include <sound/soc.h> |
27 | #include <sound/tlv.h> | 27 | #include <sound/tlv.h> |
28 | 28 | ||
29 | #include "stac9766.h" | ||
30 | |||
31 | #define STAC9766_VENDOR_ID 0x83847666 | 29 | #define STAC9766_VENDOR_ID 0x83847666 |
32 | #define STAC9766_VENDOR_ID_MASK 0xffffffff | 30 | #define STAC9766_VENDOR_ID_MASK 0xffffffff |
33 | 31 | ||
32 | #define AC97_STAC_DA_CONTROL 0x6A | ||
33 | #define AC97_STAC_ANALOG_SPECIAL 0x6E | ||
34 | #define AC97_STAC_STEREO_MIC 0x78 | ||
35 | |||
34 | /* | 36 | /* |
35 | * STAC9766 register cache | 37 | * STAC9766 register cache |
36 | */ | 38 | */ |
diff --git a/sound/soc/codecs/stac9766.h b/sound/soc/codecs/stac9766.h deleted file mode 100644 index e35cee82f416..000000000000 --- a/sound/soc/codecs/stac9766.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | /* | ||
2 | * stac9766.h -- STAC9766 Soc Audio driver | ||
3 | */ | ||
4 | |||
5 | #ifndef _STAC9766_H | ||
6 | #define _STAC9766_H | ||
7 | |||
8 | #define AC97_STAC_DA_CONTROL 0x6A | ||
9 | #define AC97_STAC_ANALOG_SPECIAL 0x6E | ||
10 | #define AC97_STAC_STEREO_MIC 0x78 | ||
11 | |||
12 | #endif | ||
diff --git a/sound/soc/fsl/efika-audio-fabric.c b/sound/soc/fsl/efika-audio-fabric.c index b2acd3293ea8..f200d1cfc4bd 100644 --- a/sound/soc/fsl/efika-audio-fabric.c +++ b/sound/soc/fsl/efika-audio-fabric.c | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | #include "mpc5200_dma.h" | 28 | #include "mpc5200_dma.h" |
29 | #include "mpc5200_psc_ac97.h" | 29 | #include "mpc5200_psc_ac97.h" |
30 | #include "../codecs/stac9766.h" | ||
31 | 30 | ||
32 | #define DRV_NAME "efika-audio-fabric" | 31 | #define DRV_NAME "efika-audio-fabric" |
33 | 32 | ||