path: root/include/linux
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-12 09:12:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-12 09:12:04 -0800
commitdea054fc7f35d4664000b1e684713a83c2bd0888 (patch)
tree1ba021620b76c5fd98134faabb88fb1e75a9e40b /include/linux
parent7df4d0c9784117f7bbaec17e9ac7f6545049b56d (diff)
parenta3485d088516be4c2ae2890e8ad64321481f2857 (diff)
Merge tag 'gpio-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fixes from Linus Walleij: "Here are some accumulated patches with small fixes for this and that in a few GPIO drivers, and a more important fix to an #ifdef in the GPIO consumer header. Summary: - Get #ifdef's right in the <linux/gpio/consumer.h> header. - Minor fixes to tb10x, clps711x, bcm281xx, intel-mid and xtensa GPIO drivers" * tag 'gpio-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpio: consumer.h: Move forward declarations outside #ifdef gpio: tb10x: GPIO_TB10X needs to select GENERIC_IRQ_CHIP gpio: clps711x: Add module alias to support module auto loading gpio: bcm281xx: Update MODULE_AUTHOR gpio: intel-mid: fix the incorrect return of idle callback gpio: xtensa: fix build when XCHAL_HAVE_CP is 0
Diffstat (limited to 'include/linux')
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>
struct device;
struct gpio_chip;
@@ -18,6 +16,8 @@ struct gpio_chip;
struct gpio_desc;
/* Acquire and dispose GPIOs */
struct gpio_desc *__must_check gpiod_get(struct device *dev,
const char *con_id);

Privacy Policy