| Message ID | 1363991114-4225-15-git-send-email-ezequiel.garcia@free-electrons.com (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Zhang Rui |
| Headers | show |
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index 4364eff..2136442 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig @@ -76,7 +76,7 @@ CONFIG_SPI=y CONFIG_SPI_ORION=y # CONFIG_HWMON is not set CONFIG_THERMAL=y -CONFIG_DOVE_THERMAL=y +CONFIG_MVEBU_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index 8f0065b..081d39f 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig @@ -120,7 +120,7 @@ CONFIG_SPI_ORION=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set CONFIG_THERMAL=y -CONFIG_KIRKWOOD_THERMAL=y +CONFIG_MVEBU_THERMAL=y CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=y CONFIG_HID_DRAGONRISE=y diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig index 2ec8119..f2ac593 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_defconfig @@ -49,6 +49,8 @@ CONFIG_MTD_M25P80=y CONFIG_SERIAL_8250_DW=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y +CONFIG_THERMAL=y +CONFIG_MVEBU_THERMAL=y CONFIG_USB_SUPPORT=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
The driver for Dove, Kirkwood and Armada XP/370 SoC has been integrated in a single driver called mvebu-thermal. Update the defconfig for each platform to reflect this. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- Please note that this change was done independentely from the thermal driver patch in order to facilitate its merge by the respective maintainers. arch/arm/configs/dove_defconfig | 2 +- arch/arm/configs/kirkwood_defconfig | 2 +- arch/arm/configs/mvebu_defconfig | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)