Hi Len,
Today's linux-next merge of the acpi tree got a conflict in
drivers/hwmon/Kconfig between commit 418e7870dca9 ("hwmon: Driver for
DA9052/53 PMIC") from the hwmon-staging tree and commit f36beb016903
("hwmon: exynos4: move thermal sensor driver to driver/thermal
directory") from the acpi tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/hwmon/Kconfig
index 4039353,2c7ef39..0000000
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@@ -314,26 -314,6 +314,16 @@@ config SENSORS_DS162
This driver can also be built as a module. If so, the module
will be called ds1621.
+config SENSORS_DA9052_ADC
+ tristate "Dialog DA9052/DA9053 ADC"
+ depends on PMIC_DA9052
+ help
+ Say y here to support the ADC found on Dialog Semiconductor
+ DA9052-BC and DA9053-AA/Bx PMICs.
+
+ This driver can also be built as module. If so, the module
+ will be called da9052-hwmon.
+
- config SENSORS_EXYNOS4_TMU
- tristate "Temperature sensor on Samsung EXYNOS4"
- depends on ARCH_EXYNOS4
- help
- If you say yes here you get support for TMU (Thermal Management
- Unit) on SAMSUNG EXYNOS4 series of SoC.
-
- This driver can also be built as a module. If so, the module
- will be called exynos4-tmu.
-
config SENSORS_I5K_AMB
tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets"
depends on PCI && EXPERIMENTAL
Attachment:
pgpn9lr3SAIsJ.pgp
Description: PGP signature
