diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-05 01:50:11 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-05 01:50:11 -0400 |
| commit | 45605a87b3f34fb71bbc6446e2d49a469e9e10dd (patch) | |
| tree | fe46494f2f390288edf1b1a0b02fabf6d4a739a0 /include | |
| parent | a09f73fabbeac81f45969ad9ed59e74fae736873 (diff) | |
| parent | 6c20c807cf5a13f61193d39bb718f7a9b5df3813 (diff) | |
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/wm8962.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/wm8962.h b/include/sound/wm8962.h index 9722aac5a138..2b5306c503fb 100644 --- a/include/sound/wm8962.h +++ b/include/sound/wm8962.h | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #define WM8962_GPIO_SET 0x10000 | 15 | #define WM8962_GPIO_SET 0x10000 |
| 16 | 16 | ||
| 17 | struct wm8962_pdata { | 17 | struct wm8962_pdata { |
| 18 | int gpio_base; | ||
| 18 | u32 gpio_init[WM8962_MAX_GPIO]; | 19 | u32 gpio_init[WM8962_MAX_GPIO]; |
| 19 | 20 | ||
| 20 | /* Setup for microphone detection, raw value to be written to | 21 | /* Setup for microphone detection, raw value to be written to |