aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-06 21:36:53 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-06 21:36:53 -0400
commit4dd1b49c6d215dc41ce50c80b4868388b93f31a3 (patch)
treecd52554d6bd8f7839585da77d6bc57dee9ef7afa /drivers
parent9b61fc4cf3a7232ecc39f573a1e68148ef40ea49 (diff)
parent58956ba23e2dce83e78cd212cc8305261647684f (diff)
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio: tps65910: add missing breaks in tps65910_gpio_init
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/tps65910-gpio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpio/tps65910-gpio.c b/drivers/gpio/tps65910-gpio.c
index 8d1ddfdd63eb..15097ca616d6 100644
--- a/drivers/gpio/tps65910-gpio.c
+++ b/drivers/gpio/tps65910-gpio.c
@@ -81,8 +81,10 @@ void tps65910_gpio_init(struct tps65910 *tps65910, int gpio_base)
81 switch(tps65910_chip_id(tps65910)) { 81 switch(tps65910_chip_id(tps65910)) {
82 case TPS65910: 82 case TPS65910:
83 tps65910->gpio.ngpio = 6; 83 tps65910->gpio.ngpio = 6;
84 break;
84 case TPS65911: 85 case TPS65911:
85 tps65910->gpio.ngpio = 9; 86 tps65910->gpio.ngpio = 9;
87 break;
86 default: 88 default:
87 return; 89 return;
88 } 90 }