Commit ee62f09b authored by Linus Torvalds's avatar Linus Torvalds

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
parents 62cd69d5 0bfb85c6
...@@ -402,9 +402,12 @@ config GPIO_TB10X ...@@ -402,9 +402,12 @@ config GPIO_TB10X
select OF_GPIO select OF_GPIO
config GPIO_TEGRA config GPIO_TEGRA
bool bool "NVIDIA Tegra GPIO support"
default y default ARCH_TEGRA
depends on ARCH_TEGRA || COMPILE_TEST depends on ARCH_TEGRA || COMPILE_TEST
depends on OF
help
Say yes here to support GPIO pins on NVIDIA Tegra SoCs.
config GPIO_TS4800 config GPIO_TS4800
tristate "TS-4800 DIO blocks and compatibles" tristate "TS-4800 DIO blocks and compatibles"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment