diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /sound/soc/codecs/wm8731.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'sound/soc/codecs/wm8731.h')
| -rw-r--r-- | sound/soc/codecs/wm8731.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8731.h b/sound/soc/codecs/wm8731.h index 99f2e3c60e33..95190e9c0c14 100644 --- a/sound/soc/codecs/wm8731.h +++ b/sound/soc/codecs/wm8731.h | |||
| @@ -35,6 +35,8 @@ | |||
| 35 | #define WM8731_DAI 0 | 35 | #define WM8731_DAI 0 |
| 36 | 36 | ||
| 37 | struct wm8731_setup_data { | 37 | struct wm8731_setup_data { |
| 38 | int spi; | ||
| 39 | int i2c_bus; | ||
| 38 | unsigned short i2c_address; | 40 | unsigned short i2c_address; |
| 39 | }; | 41 | }; |
| 40 | 42 | ||