[arch-commits] Commit in linux/trunk (PKGBUILD config config.x86_64)

[Tobias Powalowski]

    Date: Wednesday, May 20, 2015 @ 09:14:24
  Author: tpowa
Revision: 239580

add CONFIG_THERMAL_HWMON #45014

Modified:
  linux/trunk/PKGBUILD
  linux/trunk/config
  linux/trunk/config.x86_64

---------------+
 PKGBUILD      |    4 ++--
 config        |    9 +++++----
 config.x86_64 |    9 +++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-20 06:14:17 UTC (rev 239579)
+++ PKGBUILD	2015-05-20 07:14:24 UTC (rev 239580)
@@ -25,8 +25,8 @@
             'SKIP'
             'c268985a82483fe75f0f397217208e262f85a356d1d9f34b9e22255e549d7ce9'
             'SKIP'
-            'f70f2935b1881697ff986b80b444de422cf1869740ca33c25d3d1f20f5e56ba5'
-            '03b740ce5c70593d26634974499eefc9fc24841d972c38c05f9febd2d0b77249'
+            '30a964b0ace75c4be814a69cc9cd998c990dbe25e5d268c480b5d78e47358e01'
+            'c641d5ef32e5c2459bce390ec1581b34ad5727a1e20872acd763d30774112015'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
 validpgpkeys=(

Modified: config
===================================================================
--- config	2015-05-20 06:14:17 UTC (rev 239579)
+++ config	2015-05-20 07:14:24 UTC (rev 239580)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.0.0 Kernel Configuration
+# Linux/x86 4.0.4 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -151,7 +151,7 @@
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_SWAP_ENABLED=y 
+CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
@@ -3670,7 +3670,7 @@
 # CONFIG_POWER_RESET_RESTART is not set
 # CONFIG_POWER_RESET_SYSCON is not set
 CONFIG_POWER_AVS=y
-CONFIG_HWMON=m
+CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -3828,6 +3828,7 @@
 CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
@@ -5780,7 +5781,7 @@
 # Virtio drivers
 #
 CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y 
+CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y

Modified: config.x86_64
===================================================================
--- config.x86_64	2015-05-20 06:14:17 UTC (rev 239579)
+++ config.x86_64	2015-05-20 07:14:24 UTC (rev 239580)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.0.0 Kernel Configuration
+# Linux/x86 4.0.4-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -159,7 +159,7 @@
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_SWAP_ENABLED=y 
+CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
@@ -3534,7 +3534,7 @@
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_RESTART is not set
 CONFIG_POWER_AVS=y
-CONFIG_HWMON=m
+CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -3691,6 +3691,7 @@
 CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -5551,7 +5552,7 @@
 # Virtio drivers
 #
 CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y 
+CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y