From b54a46166eb6044466d978d110606f28e9be1e90 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 19 Mar 2014 10:12:19 +0100 Subject: [PATCH] linux: prepare defconfigs for axp20x thermal support Drop CONFIG_HWMON=m and CONFIG_HWMON=n and use the default value. This mirrors: https://github.com/linux-sunxi/linux-sunxi/commit/5a467f646bd75dc2ef3f4e4bafbef456472dca9e and prepares for: https://github.com/linux-sunxi/linux-sunxi/commit/fcec507519157765c689ab3473a9e72d8b6df453 Signed-off-by: Koen Kooi --- recipes-kernel/linux/linux/cubieboard/defconfig | 1 - recipes-kernel/linux/linux/cubieboard2/defconfig | 1 - recipes-kernel/linux/linux/cubietruck/defconfig | 1 - recipes-kernel/linux/linux/mele/defconfig | 1 - recipes-kernel/linux/linux/meleg/defconfig | 1 - recipes-kernel/linux/linux/olinuxino-a10s/defconfig | 1 - recipes-kernel/linux/linux/olinuxino-a20/defconfig | 1 - 7 files changed, 7 deletions(-) diff --git a/recipes-kernel/linux/linux/cubieboard/defconfig b/recipes-kernel/linux/linux/cubieboard/defconfig index 268e844..c08fe3b 100644 --- a/recipes-kernel/linux/linux/cubieboard/defconfig +++ b/recipes-kernel/linux/linux/cubieboard/defconfig @@ -170,7 +170,6 @@ CONFIG_W1_SUNXI=m CONFIG_W1_MASTER_GPIO=m CONFIG_POWER_SUPPLY=y CONFIG_AW_AXP=y -# CONFIG_HWMON is not set CONFIG_REGULATOR=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y diff --git a/recipes-kernel/linux/linux/cubieboard2/defconfig b/recipes-kernel/linux/linux/cubieboard2/defconfig index 914bd99..e5b0b42 100644 --- a/recipes-kernel/linux/linux/cubieboard2/defconfig +++ b/recipes-kernel/linux/linux/cubieboard2/defconfig @@ -698,7 +698,6 @@ CONFIG_W1=m CONFIG_W1_MASTER_GPIO=m CONFIG_POWER_SUPPLY=y CONFIG_AW_AXP=y -CONFIG_HWMON=m # CONFIG_SENSORS_MMA7660 is not set CONFIG_WATCHDOG=y CONFIG_USBPCWATCHDOG=m diff --git a/recipes-kernel/linux/linux/cubietruck/defconfig b/recipes-kernel/linux/linux/cubietruck/defconfig index 8280709..72b8be2 100644 --- a/recipes-kernel/linux/linux/cubietruck/defconfig +++ b/recipes-kernel/linux/linux/cubietruck/defconfig @@ -700,7 +700,6 @@ CONFIG_W1=m CONFIG_W1_MASTER_GPIO=m CONFIG_POWER_SUPPLY=y CONFIG_AW_AXP=y -CONFIG_HWMON=m # CONFIG_SENSORS_MMA7660 is not set CONFIG_WATCHDOG=y CONFIG_USBPCWATCHDOG=m diff --git a/recipes-kernel/linux/linux/mele/defconfig b/recipes-kernel/linux/linux/mele/defconfig index abb7339..c90e968 100644 --- a/recipes-kernel/linux/linux/mele/defconfig +++ b/recipes-kernel/linux/linux/mele/defconfig @@ -172,7 +172,6 @@ CONFIG_W1_SUNXI=m CONFIG_W1_MASTER_GPIO=m CONFIG_POWER_SUPPLY=y CONFIG_AW_AXP=y -# CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_SUNXI_WDT=y CONFIG_REGULATOR=y diff --git a/recipes-kernel/linux/linux/meleg/defconfig b/recipes-kernel/linux/linux/meleg/defconfig index abb7339..c90e968 100644 --- a/recipes-kernel/linux/linux/meleg/defconfig +++ b/recipes-kernel/linux/linux/meleg/defconfig @@ -172,7 +172,6 @@ CONFIG_W1_SUNXI=m CONFIG_W1_MASTER_GPIO=m CONFIG_POWER_SUPPLY=y CONFIG_AW_AXP=y -# CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_SUNXI_WDT=y CONFIG_REGULATOR=y diff --git a/recipes-kernel/linux/linux/olinuxino-a10s/defconfig b/recipes-kernel/linux/linux/olinuxino-a10s/defconfig index c1b15eb..54ce15a 100644 --- a/recipes-kernel/linux/linux/olinuxino-a10s/defconfig +++ b/recipes-kernel/linux/linux/olinuxino-a10s/defconfig @@ -158,7 +158,6 @@ CONFIG_W1_SUNXI=m CONFIG_W1_MASTER_GPIO=m CONFIG_POWER_SUPPLY=y CONFIG_AW_AXP=y -# CONFIG_HWMON is not set CONFIG_REGULATOR=y CONFIG_MEDIA_SUPPORT=y CONFIG_PA_CONTROL=y diff --git a/recipes-kernel/linux/linux/olinuxino-a20/defconfig b/recipes-kernel/linux/linux/olinuxino-a20/defconfig index 9262dec..32e2c88 100644 --- a/recipes-kernel/linux/linux/olinuxino-a20/defconfig +++ b/recipes-kernel/linux/linux/olinuxino-a20/defconfig @@ -700,7 +700,6 @@ CONFIG_W1=m CONFIG_W1_MASTER_GPIO=m CONFIG_POWER_SUPPLY=y CONFIG_AW_AXP=y -CONFIG_HWMON=m # CONFIG_SENSORS_MMA7660 is not set CONFIG_WATCHDOG=y CONFIG_USBPCWATCHDOG=m