This fixes the 2 compile issues related to my series: "i2c: designware: add i2c gpio recovery option" I'm not sure if you want patches on top of i2c/for-next or a respin of the series. I'm sure you'll let me know. I've got some particular combination of Kconfig flags that is pulling gpio/consumer.h into the i2c-core-base, but I can't see what it is. And I didn't pick up that the designware driver was split into two separate modules. oops. Phil Reid (2): i2c: core: fix compile issue related to incorrect gpio header i2c: designware: fix building driver as module drivers/i2c/busses/i2c-designware-common.c | 1 + drivers/i2c/i2c-core-base.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- 1.8.3.1