This fixes various gpio-related build errors (mostly potential) reported in part by Russell King and Uwe Kleine-König.
Unified · Split
| @@ -1,8 +1,12 @@ | |||
| 1 | #ifndef _ASM_GENERIC_GPIO_H | 1 | #ifndef _ASM_GENERIC_GPIO_H |
| 2 | #define _ASM_GENERIC_GPIO_H | 2 | #define _ASM_GENERIC_GPIO_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | ||
| 5 | |||
| 4 | #ifdef CONFIG_HAVE_GPIO_LIB | 6 | #ifdef CONFIG_HAVE_GPIO_LIB |
| 5 | 7 | ||
| 8 | #include <linux/compiler.h> | ||
| 9 | |||
| 6 | /* Platforms may implement their GPIO interface with library code, | 10 | /* Platforms may implement their GPIO interface with library code, |
| 7 | * at a small performance cost for non-inlined operations and some | 11 | * at a small performance cost for non-inlined operations and some |
| 8 | * extra memory (for code and for per-GPIO table entries). | 12 | * extra memory (for code and for per-GPIO table entries). |
| @@ -74,7 +78,7 @@ struct gpio_chip { · 65 unmodified lines | |||
| 74 | 78 | ||
| 75 | extern const char *gpiochip_is_requested(struct gpio_chip *chip, | 79 | extern const char *gpiochip_is_requested(struct gpio_chip *chip, |
| 76 | unsigned offset); | 80 | unsigned offset); |
| 77 | extern int __init __must_check gpiochip_reserve(int start, int ngpio); | 81 | extern int __must_check gpiochip_reserve(int start, int ngpio); |
| 78 | 82 | ||
| 79 | /* add/remove chips */ | 83 | /* add/remove chips */ |
| 80 | extern int gpiochip_add(struct gpio_chip *chip); | 84 | extern int gpiochip_add(struct gpio_chip *chip); |
| @@ -8,6 +8,9 @@ · 7 unmodified lines | |||
| 8 | 8 | ||
| 9 | #else | 9 | #else |
| 10 | 10 | ||
| 11 | #include <linux/types.h> | ||
| 12 | #include <linux/errno.h> | ||
| 13 | |||
| 11 | /* | 14 | /* |
| 12 | * Some platforms don't support the GPIO programming interface. | 15 | * Some platforms don't support the GPIO programming interface. |
| 13 | * | 16 | * |