projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpio
/
gpio-pch.c
diff --git
a/drivers/gpio/gpio-pch.c
b/drivers/gpio/gpio-pch.c
index e0ac549dccb54c43261d71df59da196144502d67..2d9a950ca2d46d1b65f26e7c85ac6861b1892ae0 100644
(file)
--- a/
drivers/gpio/gpio-pch.c
+++ b/
drivers/gpio/gpio-pch.c
@@
-171,6
+171,7
@@
static int pch_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
return 0;
}
+#ifdef CONFIG_PM
/*
* Save register configuration and disable interrupts.
*/
@@
-206,6
+207,7
@@
static void pch_gpio_restore_reg_conf(struct pch_gpio *chip)
iowrite32(chip->pch_gpio_reg.gpio_use_sel_reg,
&chip->reg->gpio_use_sel);
}
+#endif
static int pch_gpio_to_irq(struct gpio_chip *gpio, unsigned offset)
{