diff --git a/[refs] b/[refs] index 7bd40563b803..a93060a084aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 836cb711ad7960e52625b24195d6e70b79ab0816 +refs/heads/master: 323b7fe8f8f6d5ac6214382cf30e8b3a80b265c9 diff --git a/trunk/include/linux/gpio.h b/trunk/include/linux/gpio.h index 4b47ed96f131..32720baf70f1 100644 --- a/trunk/include/linux/gpio.h +++ b/trunk/include/linux/gpio.h @@ -35,13 +35,13 @@ static inline int gpio_request(unsigned gpio, const char *label) return -ENOSYS; } -static inline int __must_check gpio_request_one(unsigned gpio, +static inline int gpio_request_one(unsigned gpio, unsigned long flags, const char *label) { return -ENOSYS; } -static inline int __must_check gpio_request_array(struct gpio *array, size_t num) +static inline int gpio_request_array(struct gpio *array, size_t num) { return -ENOSYS; }