diff options
author | David Brown <davidb@codeaurora.org> | 2011-01-28 11:31:53 -0800 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2011-01-28 11:31:53 -0800 |
commit | ecca8194c16bdf6cde99a2b29c23a77901cd61a6 (patch) | |
tree | 80b533b480b94b1bdc4dad3b0d300868f44cde04 /arch/arm/mach-msm/board-trout-gpio.c | |
parent | d1f4cec78ee3141a78b2b35969f5bebf7ea9b208 (diff) | |
parent | 07a3cc4814f790354d4c7be2c9dc6143a714a07a (diff) |
Merge branch 'msm-core' into for-next
* msm-core:
msm: Clean up useless ifdefs
msm: clock: Add support for more proc_comm clocks
msm: clock: Invert debugfs directory layout
msm: clock: Move debugfs code from clock.c to clock-debug.c
msm: clock: Remove 7x30 and pcom includes from clock.h
msm: clock: Remove unused code and definitions
msm: Warning fix in trout gpio board file
msm: Remove broken register definition from trout
Diffstat (limited to 'arch/arm/mach-msm/board-trout-gpio.c')
-rw-r--r-- | arch/arm/mach-msm/board-trout-gpio.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c index a604ec1e44b..31117a4499c 100644 --- a/arch/arm/mach-msm/board-trout-gpio.c +++ b/arch/arm/mach-msm/board-trout-gpio.c @@ -74,8 +74,6 @@ static int msm_gpiolib_direction_output(struct gpio_chip *chip, static int trout_gpio_to_irq(struct gpio_chip *chip, unsigned offset) { - struct msm_gpio_chip *msm_gpio = to_msm_gpio_chip(chip); - return TROUT_GPIO_TO_INT(offset + chip->base); } |