Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2

This commit is contained in:
Stephan Raue
2013-09-12 10:46:18 +02:00
10 changed files with 13 additions and 10 deletions

View File

@@ -25,7 +25,10 @@
TEMP=0
if [ -f /sys/devices/platform/coretemp.0/temp1_input ]; then
if [ -f /sys/class/hwmon/hwmon1/temp1_input ]; then
# used on Asus systems (ie. AT5IONT-I)
TEMP=`cat /sys/class/hwmon/hwmon1/temp1_input`
elif [ -f /sys/devices/platform/coretemp.0/temp1_input ]; then
# used with coretemp
TEMP=`cat /sys/devices/platform/coretemp.0/temp1_input`
elif [ -f /sys/devices/platform/coretemp.0/temp2_input ]; then

View File

@@ -1886,7 +1886,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers
#
# CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

View File

@@ -1848,7 +1848,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers
#
# CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

View File

@@ -1963,7 +1963,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers
#
# CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

View File

@@ -1939,7 +1939,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers
#
# CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

View File

@@ -1961,7 +1961,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers
#
# CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

View File

@@ -1835,7 +1835,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers
#
# CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

View File

@@ -1866,7 +1866,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers
#
# CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

View File

@@ -1962,7 +1962,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers
#
# CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

View File

@@ -1938,7 +1938,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers
#
# CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y