diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:22:48 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:22:48 +0100 |
| commit | 0cb6f2c19e6fa41af25a0adaea651b29ef19c482 (patch) | |
| tree | dd7c099a598dde44c157e01f4c8e74237b01ea1c /include | |
| parent | 28124d02f2979a41b8f635e531c6e422a42ba816 (diff) | |
| parent | f87af10fb158033b922f19828c1164325df4974e (diff) | |
| download | barebox-0cb6f2c19e6fa41af25a0adaea651b29ef19c482.tar.gz barebox-0cb6f2c19e6fa41af25a0adaea651b29ef19c482.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'include')
| -rw-r--r-- | include/of_gpio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/of_gpio.h b/include/of_gpio.h index 50536a8a38..d42b18e63f 100644 --- a/include/of_gpio.h +++ b/include/of_gpio.h @@ -21,11 +21,11 @@ enum of_gpio_flags { OF_GPIO_ACTIVE_LOW = 0x1, }; -#ifdef CONFIG_OFTREE +#ifdef CONFIG_OF_GPIO extern int of_get_named_gpio_flags(struct device_node *np, const char *list_name, int index, enum of_gpio_flags *flags); -#else /* CONFIG_OFTREE */ +#else /* CONFIG_OF_GPIO */ static inline int of_get_named_gpio_flags(struct device_node *np, const char *list_name, int index, enum of_gpio_flags *flags) @@ -33,7 +33,7 @@ static inline int of_get_named_gpio_flags(struct device_node *np, return -ENOSYS; } -#endif /* CONFIG_OFTREE */ +#endif /* CONFIG_OF_GPIO */ static inline int of_get_named_gpio(struct device_node *np, const char *list_name, int index) |