projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'intel-gpio-v6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy...
[linux-2.6-block.git]
/
drivers
/
pinctrl
/
pinctrl-cy8c95x0.c
diff --git
a/drivers/pinctrl/pinctrl-cy8c95x0.c
b/drivers/pinctrl/pinctrl-cy8c95x0.c
index 67b5d160c027ed3e429d1f246c3dc1028c4c52c7..981c569bd671c0b2a74bdd4d0191cdc4689de7c5 100644
(file)
--- a/
drivers/pinctrl/pinctrl-cy8c95x0.c
+++ b/
drivers/pinctrl/pinctrl-cy8c95x0.c
@@
-95,7
+95,7
@@
static int cy8c95x0_acpi_get_irq(struct device *dev)
if (ret)
dev_warn(dev, "can't add GPIO ACPI mapping\n");
- ret = acpi_dev_gpio_irq_get_by(ACPI_COMPANION(dev), "irq
-gpios
", 0);
+ ret = acpi_dev_gpio_irq_get_by(ACPI_COMPANION(dev), "irq", 0);
if (ret < 0)
return ret;