Merge tag 'v3.14-rc6' into devel

Linux 3.14-rc6
This commit is contained in:
Linus Walleij
2014-03-14 10:26:45 +01:00
1429 changed files with 17464 additions and 9013 deletions

View File

@@ -4,8 +4,6 @@
#include <linux/err.h>
#include <linux/kernel.h>
#ifdef CONFIG_GPIOLIB
struct device;
/**
@@ -17,6 +15,8 @@ struct device;
*/
struct gpio_desc;
#ifdef CONFIG_GPIOLIB
/* Acquire and dispose GPIOs */
struct gpio_desc *__must_check gpiod_get(struct device *dev,
const char *con_id);