diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2011-07-06 18:36:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2011-07-06 18:36:53 -0700 |
| commit | 4dd1b49c6d215dc41ce50c80b4868388b93f31a3 (patch) | |
| tree | cd52554d6bd8f7839585da77d6bc57dee9ef7afa | |
| parent | Documentation: fix cgroup blkio throttle filenames (diff) | |
| parent | gpio: tps65910: add missing breaks in tps65910_gpio_init (diff) | |
| download | linux-4dd1b49c6d215dc41ce50c80b4868388b93f31a3.tar.gz linux-4dd1b49c6d215dc41ce50c80b4868388b93f31a3.tar.bz2 linux-4dd1b49c6d215dc41ce50c80b4868388b93f31a3.zip | |
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
| -rw-r--r-- | drivers/gpio/tps65910-gpio.c | 2 |
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) switch(tps65910_chip_id(tps65910)) { case TPS65910: tps65910->gpio.ngpio = 6; + break; case TPS65911: tps65910->gpio.ngpio = 9; + break; default: return; } |