diff options
| -rw-r--r-- | sound/soc/codecs/wm9705.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm9705.h | 11 | ||||
| -rw-r--r-- | sound/soc/pxa/e740_wm9705.c | 1 | ||||
| -rw-r--r-- | sound/soc/pxa/e750_wm9705.c | 1 |
4 files changed, 0 insertions, 15 deletions
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index e73ff6176622..f6d5c0f2aea5 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c | |||
| @@ -21,8 +21,6 @@ | |||
| 21 | #include <sound/initval.h> | 21 | #include <sound/initval.h> |
| 22 | #include <sound/soc.h> | 22 | #include <sound/soc.h> |
| 23 | 23 | ||
| 24 | #include "wm9705.h" | ||
| 25 | |||
| 26 | #define WM9705_VENDOR_ID 0x574d4c05 | 24 | #define WM9705_VENDOR_ID 0x574d4c05 |
| 27 | #define WM9705_VENDOR_ID_MASK 0xffffffff | 25 | #define WM9705_VENDOR_ID_MASK 0xffffffff |
| 28 | 26 | ||
diff --git a/sound/soc/codecs/wm9705.h b/sound/soc/codecs/wm9705.h deleted file mode 100644 index 23ea9ce47359..000000000000 --- a/sound/soc/codecs/wm9705.h +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * wm9705.h -- WM9705 Soc Audio driver | ||
| 3 | */ | ||
| 4 | |||
| 5 | #ifndef _WM9705_H | ||
| 6 | #define _WM9705_H | ||
| 7 | |||
| 8 | #define WM9705_DAI_AC97_HIFI 0 | ||
| 9 | #define WM9705_DAI_AC97_AUX 1 | ||
| 10 | |||
| 11 | #endif | ||
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index 1de876529aa1..086c37a85630 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
| 24 | 24 | ||
| 25 | #include "../codecs/wm9705.h" | ||
| 26 | #include "pxa2xx-ac97.h" | 25 | #include "pxa2xx-ac97.h" |
| 27 | 26 | ||
| 28 | 27 | ||
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c index b7eb7cd5df7d..7823278012a6 100644 --- a/sound/soc/pxa/e750_wm9705.c +++ b/sound/soc/pxa/e750_wm9705.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
| 24 | 24 | ||
| 25 | #include "../codecs/wm9705.h" | ||
| 26 | #include "pxa2xx-ac97.h" | 25 | #include "pxa2xx-ac97.h" |
| 27 | 26 | ||
| 28 | static int e750_spk_amp_event(struct snd_soc_dapm_widget *w, | 27 | static int e750_spk_amp_event(struct snd_soc_dapm_widget *w, |
