Hi Samuel, Today's linux-next merge of the mfd tree got a conflict in arch/arm/configs/tegra_defconfig between commit dbebe1589d3a ("ARM: tegra: defconfig updates") from Linus' tree and commit 05f3ad2b8ae5 ("ARM: tegra: defconfig: Enable tps6586x gpio") from the mfd tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc arch/arm/configs/tegra_defconfig index 4be9c1e,7c0d115..0000000 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@@ -105,7 -106,7 +105,8 @@@ CONFIG_I2C_MUX_PINCTRL= CONFIG_I2C_TEGRA=y CONFIG_SPI=y CONFIG_SPI_TEGRA=y + CONFIG_GPIO_TPS6586X=y +CONFIG_GPIO_TPS65910=y CONFIG_POWER_SUPPLY=y CONFIG_BATTERY_SBS=y CONFIG_SENSORS_LM90=y
Attachment:
pgpo1p0z4aPEj.pgp
Description: PGP signature