aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorHongtao Jia <hongtao.jia@freescale.com>2015-03-12 03:00:13 -0400
committerScott Wood <scottwood@freescale.com>2015-03-23 20:51:21 -0400
commit76486930f8eb2bd7adb3bc892afdbdac002078c7 (patch)
tree3360b513ec9e74400eb89b974f99624cf1ff103c /arch/powerpc
parent2e6e99666de1005fb2d201320082bd89442b7b14 (diff)
powerpc: Enable thermal monitor feature in defconfig for supported platforms
Signed-off-by: Jia Hongtao <hongtao.jia@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/configs/corenet32_smp_defconfig2
-rw-r--r--arch/powerpc/configs/corenet64_smp_defconfig2
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig3
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig2
4 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
index 5242355eaf00..a6d7b3d3b033 100644
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -120,7 +120,7 @@ CONFIG_SPI=y
120CONFIG_SPI_GPIO=y 120CONFIG_SPI_GPIO=y
121CONFIG_SPI_FSL_SPI=y 121CONFIG_SPI_FSL_SPI=y
122CONFIG_SPI_FSL_ESPI=y 122CONFIG_SPI_FSL_ESPI=y
123# CONFIG_HWMON is not set 123CONFIG_SENSORS_LM90=y
124CONFIG_USB_HID=m 124CONFIG_USB_HID=m
125CONFIG_USB=y 125CONFIG_USB=y
126CONFIG_USB_MON=y 126CONFIG_USB_MON=y
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
index 3d694d233de4..2dcf032ec2de 100644
--- a/arch/powerpc/configs/corenet64_smp_defconfig
+++ b/arch/powerpc/configs/corenet64_smp_defconfig
@@ -113,7 +113,7 @@ CONFIG_SPI=y
113CONFIG_SPI_GPIO=y 113CONFIG_SPI_GPIO=y
114CONFIG_SPI_FSL_SPI=y 114CONFIG_SPI_FSL_SPI=y
115CONFIG_SPI_FSL_ESPI=y 115CONFIG_SPI_FSL_ESPI=y
116# CONFIG_HWMON is not set 116CONFIG_SENSORS_LM90=y
117CONFIG_USB_HID=m 117CONFIG_USB_HID=m
118CONFIG_USB=y 118CONFIG_USB=y
119CONFIG_USB_MON=y 119CONFIG_USB_MON=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 8535c343dd57..6ecf7bdbc2f9 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -150,8 +150,7 @@ CONFIG_SPI=y
150CONFIG_SPI_FSL_SPI=y 150CONFIG_SPI_FSL_SPI=y
151CONFIG_SPI_FSL_ESPI=y 151CONFIG_SPI_FSL_ESPI=y
152CONFIG_GPIO_MPC8XXX=y 152CONFIG_GPIO_MPC8XXX=y
153CONFIG_HWMON=m 153CONFIG_SENSORS_LM90=y
154CONFIG_SENSORS_LM90=m
155CONFIG_FB=y 154CONFIG_FB=y
156CONFIG_FB_FSL_DIU=y 155CONFIG_FB_FSL_DIU=y
157# CONFIG_VGA_CONSOLE is not set 156# CONFIG_VGA_CONSOLE is not set
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index c45ad2e01b0c..b6c7111ea913 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -143,7 +143,7 @@ CONFIG_SPI=y
143CONFIG_SPI_FSL_SPI=y 143CONFIG_SPI_FSL_SPI=y
144CONFIG_SPI_FSL_ESPI=y 144CONFIG_SPI_FSL_ESPI=y
145CONFIG_GPIO_MPC8XXX=y 145CONFIG_GPIO_MPC8XXX=y
146# CONFIG_HWMON is not set 146CONFIG_SENSORS_LM90=y
147CONFIG_FB=y 147CONFIG_FB=y
148CONFIG_FB_FSL_DIU=y 148CONFIG_FB_FSL_DIU=y
149# CONFIG_VGA_CONSOLE is not set 149# CONFIG_VGA_CONSOLE is not set