From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 14 Mar 2014 09:26:45 +0000 (+0100)
Subject: Merge tag 'v3.14-rc6' into devel
X-Git-Tag: v3.15-rc1~105^2~24
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9e294427f6e427dbaf46140303acded06365f53c;p=linux.git

Merge tag 'v3.14-rc6' into devel

Linux 3.14-rc6
---

9e294427f6e427dbaf46140303acded06365f53c
diff --cc include/linux/gpio/consumer.h
index dccda505ba7c,7a8144fef406..bed128e8f4b1
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@@ -4,9 -4,8 +4,7 @@@
  #include <linux/err.h>
  #include <linux/kernel.h>
  
- #ifdef CONFIG_GPIOLIB
- 
  struct device;
 -struct gpio_chip;
  
  /**
   * Opaque descriptor for a GPIO. These are obtained using gpiod_get() and are