diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-07-05 16:58:54 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-07-05 16:58:54 +0200 |
commit | 5e67cc4041304a0dc77e6cfbb355d69eefb883d0 (patch) | |
tree | 4eb04d0a2890f2e0a182e762071fea4ffb5abe5d /drivers/gpio/gpiolib-of.c | |
parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
parent | 96b70641b937e99c1579cb6ebbcdb7b0af98cdd0 (diff) |
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 into grant
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpiolib-of.c')
-rw-r--r-- | drivers/gpio/gpiolib-of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index d18068a9f3ec..8389d4a0ec45 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -21,7 +21,7 @@ #include <linux/of_gpio.h> #include <linux/slab.h> -/* Private data structure for of_gpiochip_is_match */ +/* Private data structure for of_gpiochip_find_and_xlate */ struct gg_data { enum of_gpio_flags *flags; struct of_phandle_args gpiospec; |