diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-01 18:13:48 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-01 18:13:48 +0200 |
commit | 4a2d732f5d1a2adf38a5baaa2f27094024be65e9 (patch) | |
tree | fbc8e050fb8f8d66fbb676746888080841882def /drivers/of | |
parent | Merge branch 'for-3.1-rc1' of git://gitorious.org/linux-omap-dss2/linux (diff) | |
parent | Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux... (diff) | |
download | linux-4a2d732f5d1a2adf38a5baaa2f27094024be65e9.tar.xz linux-4a2d732f5d1a2adf38a5baaa2f27094024be65e9.zip |
Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
gpio_msm: Move Qualcomm MSM v2 gpio driver into drivers
gpio_msm: Move Qualcomm v6 MSM driver into drivers
msm: gpio: Fold register defs into C file
msm: gpiomux: Move public API to public header
msm: gpio: Remove ifdefs on gpio chip registers
msm: gpio: Remove chip-specific register definitions
msm: Remove chip-ifdefs for GPIO io mappings
msm: gpio: Remove unsupported devices
gpio: ab8500: fix MODULE_ALIAS for ab8500
of/gpio: export of_gpio_simple_xlate
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/gpio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c index 3007662ac614..ef0105fa52b1 100644 --- a/drivers/of/gpio.c +++ b/drivers/of/gpio.c @@ -127,8 +127,8 @@ EXPORT_SYMBOL(of_gpio_count); * gpio chips. This function performs only one sanity check: whether gpio * is less than ngpios (that is specified in the gpio_chip). */ -static int of_gpio_simple_xlate(struct gpio_chip *gc, struct device_node *np, - const void *gpio_spec, u32 *flags) +int of_gpio_simple_xlate(struct gpio_chip *gc, struct device_node *np, + const void *gpio_spec, u32 *flags) { const __be32 *gpio = gpio_spec; const u32 n = be32_to_cpup(gpio); @@ -152,6 +152,7 @@ static int of_gpio_simple_xlate(struct gpio_chip *gc, struct device_node *np, return n; } +EXPORT_SYMBOL(of_gpio_simple_xlate); /** * of_mm_gpiochip_add - Add memory mapped GPIO chip (bank) |