diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 06:49:13 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 06:49:13 +0200 |
commit | 91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e (patch) | |
tree | c96ed92413044a28d17783e84a8824bfd2437af1 /arch/arm/configs/tegra_defconfig | |
parent | sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757 (diff) | |
parent | serial: sh-sci: fix compilation breakage, when DMA is enabled (diff) | |
download | linux-91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e.tar.xz linux-91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e.zip |
Merge branch 'sh/dmaengine' into sh-latest
Diffstat (limited to 'arch/arm/configs/tegra_defconfig')
-rw-r--r-- | arch/arm/configs/tegra_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 4be9c1e80ee6..db2245353f0f 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -106,6 +106,7 @@ CONFIG_I2C_TEGRA=y CONFIG_SPI=y CONFIG_SPI_TEGRA=y CONFIG_GPIO_TPS65910=y +CONFIG_GPIO_TPS6586X=y CONFIG_POWER_SUPPLY=y CONFIG_BATTERY_SBS=y CONFIG_SENSORS_LM90=y |