diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-16 03:03:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-16 03:03:30 +0200 |
| commit | 1765a367a3b5d5e9692949b0c5ec933eff2c0701 (patch) | |
| tree | 8dad931aab78c8f83588eec7cd3ff1f6dcae0f65 /drivers | |
| parent | ARM: fix regression in IXP4xx clocksource (diff) | |
| parent | gpio: wm831x: add a missing break in wm831x_gpio_dbg_show (diff) | |
| download | linux-1765a367a3b5d5e9692949b0c5ec933eff2c0701.tar.xz linux-1765a367a3b5d5e9692949b0c5ec933eff2c0701.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: wm831x: add a missing break in wm831x_gpio_dbg_show
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/wm831x-gpio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/wm831x-gpio.c b/drivers/gpio/wm831x-gpio.c index 309644cf4d9b..2bcfb0be09ff 100644 --- a/drivers/gpio/wm831x-gpio.c +++ b/drivers/gpio/wm831x-gpio.c @@ -180,6 +180,7 @@ static void wm831x_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) break; case WM831X_GPIO_PULL_UP: pull = "pullup"; + break; default: pull = "INVALID PULL"; break; |