Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (10a0d912) · Commits · 戴 / test

drivers/acpi/acpica/nsxfeval.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,6 @@ ACPI_MODULE_NAME("nsxfeval")
	/* Local prototypes */		/* Local prototypes */
	static void acpi_ns_resolve_references(struct acpi_evaluate_info *info);		static void acpi_ns_resolve_references(struct acpi_evaluate_info *info);

	#ifdef ACPI_FUTURE_USAGE
	/*******************************************************************************		/*******************************************************************************
	*		*
	* FUNCTION: acpi_evaluate_object_typed		* FUNCTION: acpi_evaluate_object_typed
	@@ -147,7 +146,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
	}		}

	ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)		ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)
	#endif /* ACPI_FUTURE_USAGE */
	/*******************************************************************************		/*******************************************************************************
	*		*
	* FUNCTION: acpi_evaluate_object		* FUNCTION: acpi_evaluate_object

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -248,6 +248,18 @@ config SENSORS_ASB100
	This driver can also be built as a module. If so, the module		This driver can also be built as a module. If so, the module
	will be called asb100.		will be called asb100.

			config SENSORS_ATK0110
			tristate "ASUS ATK0110 ACPI hwmon"
			depends on X86 && ACPI && EXPERIMENTAL
			help
			If you say yes here you get support for the ACPI hardware
			monitoring interface found in many ASUS motherboards. This
			driver will provide readings of fans, voltages and temperatures
			through the system firmware.

			This driver can also be built as a module. If so, the module
			will be called asus_atk0110.

	config SENSORS_ATXP1		config SENSORS_ATXP1
	tristate "Attansic ATXP1 VID controller"		tristate "Attansic ATXP1 VID controller"
	depends on I2C && EXPERIMENTAL		depends on I2C && EXPERIMENTAL

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ obj-$(CONFIG_SENSORS_ADT7475) += adt7475.o

	obj-$(CONFIG_SENSORS_APPLESMC) += applesmc.o		obj-$(CONFIG_SENSORS_APPLESMC) += applesmc.o
	obj-$(CONFIG_SENSORS_AMS) += ams/		obj-$(CONFIG_SENSORS_AMS) += ams/
			obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o
	obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o		obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
	obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o		obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o
	obj-$(CONFIG_SENSORS_DME1737) += dme1737.o		obj-$(CONFIG_SENSORS_DME1737) += dme1737.o