diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /sound/soc/codecs/wm8731.h | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
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 | ||