git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'gpio-v4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
gpio
/
gpio-arizona.c
diff --git
a/drivers/gpio/gpio-arizona.c
b/drivers/gpio/gpio-arizona.c
index eb5a0ce49fa59ecc0c8486a40d7a2d78d7b998aa..052fbc8fdaaa69da322297e6497a13778f3dabe3 100644
(file)
--- a/
drivers/gpio/gpio-arizona.c
+++ b/
drivers/gpio/gpio-arizona.c
@@
-116,6
+116,7
@@
static int arizona_gpio_probe(struct platform_device *pdev)
switch (arizona->type) {
case WM5102:
case WM5110:
+ case WM8280:
case WM8997:
arizona_gpio->gpio_chip.ngpio = 5;
break;