Merge branch 'master' into for-next

[~andy/linux] / include / sound / wm8962.h

diff --git a/include/sound/wm8962.h b/include/sound/wm8962.h
index 9722aac5a138c217361fae81286ac268ee724b3d..2b5306c503fbc66e97c22dd07bb089b27c9aad71 100644 (file)
--- a/include/sound/wm8962.h
+++ b/include/sound/wm8962.h
@@ -15,6 +15,7 @@
 #define WM8962_GPIO_SET 0x10000
 
 struct wm8962_pdata {
+       int gpio_base;
        u32 gpio_init[WM8962_MAX_GPIO];
 
        /* Setup for microphone detection, raw value to be written to