Merge branches 'ib-mfd-gpio-4.12', 'ib-mfd-iio-input-4.12', 'ib-mfd-input-4.12',...

diff --combined include/linux/mfd/motorola-cpcap.h
index b4031c2,b4031c2,793aa69,53758a7,b4031c2,b4031c2..aefc49c
--- 1/include/linux/mfd/motorola-cpcap.h
--- 2/include/linux/mfd/motorola-cpcap.h
--- 3/include/linux/mfd/motorola-cpcap.h
--- 4/include/linux/mfd/motorola-cpcap.h
--- 5/include/linux/mfd/motorola-cpcap.h
--- 6/include/linux/mfd/motorola-cpcap.h
+++ b/include/linux/mfd/motorola-cpcap.h
@@@@@@@ -14,6 -14,6 -14,6 -14,9 -14,6 -14,6 +14,9 @@@@@@@
       * published by the Free Software Foundation.
       */
      
+++ ++#include <linux/device.h>
+++ ++#include <linux/regmap.h>
+++ ++
      #define CPCAP_VENDOR_ST           0
      #define CPCAP_VENDOR_TI           1
      
@@@@@@@ -290,3 -290,3 -290,5 -293,3 -290,3 -290,3 +293,5 @@@@@@@ static inline int cpcap_get_vendor(stru
      
        return 0;
      }
++ +++
++ +++extern int cpcap_sense_virq(struct regmap *regmap, int virq);