diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 04:00:30 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 04:00:30 -0400 |
| commit | aa5c14d5c0d3e4c587db4a1b220b9c86415c538f (patch) | |
| tree | 0114637e8be2b38176e7e91e6cea3501b22cb66a /sound/soc/codecs/wm8750.h | |
| parent | 79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (diff) | |
| parent | b11bdb5254ff17cb63e4ae5088b73fdcd2cc2602 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
Diffstat (limited to 'sound/soc/codecs/wm8750.h')
| -rw-r--r-- | sound/soc/codecs/wm8750.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm8750.h b/sound/soc/codecs/wm8750.h index 1dc100e19cfe..121427c047fb 100644 --- a/sound/soc/codecs/wm8750.h +++ b/sound/soc/codecs/wm8750.h | |||
| @@ -57,13 +57,4 @@ | |||
| 57 | 57 | ||
| 58 | #define WM8750_SYSCLK 0 | 58 | #define WM8750_SYSCLK 0 |
| 59 | 59 | ||
| 60 | struct wm8750_setup_data { | ||
| 61 | int spi; | ||
| 62 | int i2c_bus; | ||
| 63 | unsigned short i2c_address; | ||
| 64 | }; | ||
| 65 | |||
| 66 | extern struct snd_soc_dai wm8750_dai; | ||
| 67 | extern struct snd_soc_codec_device soc_codec_dev_wm8750; | ||
| 68 | |||
| 69 | #endif | 60 | #endif |