| From 93ddef2b562af51470f2066c6396721cf4f86c15 Mon Sep 17 00:00:00 2001 |
| From: Phil Reid <preid@electromag.com.au> |
| Date: Tue, 28 Nov 2017 11:09:10 +0800 |
| Subject: [PATCH 0776/1795] i2c: core: fix compile issue related to incorrect |
| gpio header |
| |
| The correct header to include for the gpiod interface is |
| <linux/gpio/consumer.h>. |
| |
| Fixes: 3991c5c80beaf7eb9 ("i2c: Switch to using gpiod interface for gpio bus recovery") |
| Signed-off-by: Phil Reid <preid@electromag.com.au> |
| Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| (cherry picked from commit 10c9ef045a7e19e9fd4c829c7321f9d2048808c0) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| |
| Conflicts: |
| drivers/i2c/i2c-core-base.c |
| --- |
| drivers/i2c/i2c-core-base.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c |
| index b9f39122a059..268f12f421af 100644 |
| --- a/drivers/i2c/i2c-core-base.c |
| +++ b/drivers/i2c/i2c-core-base.c |
| @@ -28,6 +28,7 @@ |
| #include <linux/err.h> |
| #include <linux/errno.h> |
| #include <linux/gpio.h> |
| +#include <linux/gpio/consumer.h> |
| #include <linux/i2c.h> |
| #include <linux/idr.h> |
| #include <linux/init.h> |
| -- |
| 2.19.0 |
| |
