diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-21 21:36:40 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-21 21:37:09 +0100 |
| commit | d97a860c4f3de98ba5040a22f305b7159fe17cff (patch) | |
| tree | 90c2155ec5a1f3115a9eb7a86f25d1a4610227c6 /include/linux/gpio/consumer.h | |
| parent | 3f67d962c64d9b6de9dab81bdbe6d5c94c80d9b9 (diff) | |
| parent | d158fc7f36a25e19791d25a55da5623399a2644f (diff) | |
| download | blackbird-op-linux-d97a860c4f3de98ba5040a22f305b7159fe17cff.tar.gz blackbird-op-linux-d97a860c4f3de98ba5040a22f305b7159fe17cff.zip | |
Merge branch 'linus' into sched/core
Reason: Bring bakc upstream modification to resolve conflicts
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/gpio/consumer.h')
| -rw-r--r-- | include/linux/gpio/consumer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index 4d34dbbbad4d..7a8144fef406 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -4,8 +4,6 @@ #include <linux/err.h> #include <linux/kernel.h> -#ifdef CONFIG_GPIOLIB - struct device; struct gpio_chip; @@ -18,6 +16,8 @@ struct gpio_chip; */ struct gpio_desc; +#ifdef CONFIG_GPIOLIB + /* Acquire and dispose GPIOs */ struct gpio_desc *__must_check gpiod_get(struct device *dev, const char *con_id); |
