diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /sound/soc/codecs/wm8753.h | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'sound/soc/codecs/wm8753.h')
| -rw-r--r-- | sound/soc/codecs/wm8753.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8753.h b/sound/soc/codecs/wm8753.h index f55704ce931b..57b2ba244040 100644 --- a/sound/soc/codecs/wm8753.h +++ b/sound/soc/codecs/wm8753.h | |||
| @@ -77,12 +77,6 @@ | |||
| 77 | #define WM8753_BIASCTL 0x3d | 77 | #define WM8753_BIASCTL 0x3d |
| 78 | #define WM8753_ADCTL2 0x3f | 78 | #define WM8753_ADCTL2 0x3f |
| 79 | 79 | ||
| 80 | struct wm8753_setup_data { | ||
| 81 | int spi; | ||
| 82 | int i2c_bus; | ||
| 83 | unsigned short i2c_address; | ||
| 84 | }; | ||
| 85 | |||
| 86 | #define WM8753_PLL1 0 | 80 | #define WM8753_PLL1 0 |
| 87 | #define WM8753_PLL2 1 | 81 | #define WM8753_PLL2 1 |
| 88 | 82 | ||