summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-23 12:03:21 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-23 12:03:21 +0900
commitee62f09bda631151a55e2b2543acba5a38eef186 (patch)
tree938bdb7fb595192b3663355a00e3cdf4a088266a
parent62cd69d5b0cde8aaea2d2a8f828be65196bf1ada (diff)
parent0bfb85c6ba620c39c0e5124851a1bea0f5a56e05 (diff)
downloadlinux-ee62f09bda631151a55e2b2543acba5a38eef186.tar.gz
linux-ee62f09bda631151a55e2b2543acba5a38eef186.tar.xz
Merge tag 'gpio-v4.7-6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fix from Linus Walleij: "Compile problem fix for Tegra, Sorry to send this in the last minute but Ingo says this build failure is very prominent so I'm not going to wait for v4.7 before sending it. It is a case of COMPILE_TEST causing more problems than it solves and I'm already swearing about me shooting myself in the foot with that gun :(" * tag 'gpio-v4.7-6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpio: tegra: don't auto-enable for COMPILE_TEST
-rw-r--r--drivers/gpio/Kconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 536112f..d786061 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -402,9 +402,12 @@ config GPIO_TB10X
select OF_GPIO
config GPIO_TEGRA
- bool
- default y
+ bool "NVIDIA Tegra GPIO support"
+ default ARCH_TEGRA
depends on ARCH_TEGRA || COMPILE_TEST
+ depends on OF
+ help
+ Say yes here to support GPIO pins on NVIDIA Tegra SoCs.
config GPIO_TS4800
tristate "TS-4800 DIO blocks and compatibles"