| commit | 1765a367a3b5d5e9692949b0c5ec933eff2c0701 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 15 18:03:30 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 15 18:03:30 2011 -0700 |
| tree | 8dad931aab78c8f83588eec7cd3ff1f6dcae0f65 | |
| parent | 900b170af40b4fef54e89f3d48d055f7d8031ae6 [diff] | |
| parent | 164d5c3988baf61f40c5749ddc063a9cdca8f521 [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: wm831x: add a missing break in wm831x_gpio_dbg_show
diff --git a/drivers/gpio/wm831x-gpio.c b/drivers/gpio/wm831x-gpio.c index 309644c..2bcfb0b 100644 --- a/drivers/gpio/wm831x-gpio.c +++ b/drivers/gpio/wm831x-gpio.c
@@ -180,6 +180,7 @@ break; case WM831X_GPIO_PULL_UP: pull = "pullup"; + break; default: pull = "INVALID PULL"; break;