Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae41fce3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon fixes from Guenter Roeck:
 "An e-mail address update, and fix a compile error on SPARC"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: Only include of_match_table with CONFIG_OF_GPIO
  hwmon, fam15h_power: Change email address, MAINTAINERS entry
parents b987a834 eaa7cc60

Documentation/hwmon/fam15h_power

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Supported chips: 
  BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors

    (not yet published)



Author: Andreas Herrmann <andreas.herrmann3@amd.com>

Author: Andreas Herrmann <herrmann.der.user@googlemail.com>



Description

-----------

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ F: include/linux/altera_uart.h 
F:	include/linux/altera_jtaguart.h



AMD FAM15H PROCESSOR POWER MONITORING DRIVER

M:	Andreas Herrmann <andreas.herrmann3@amd.com>

M:	Andreas Herrmann <herrmann.der.user@googlemail.com>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/fam15h_power

drivers/hwmon/fam15h_power.c

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * fam15h_power.c - AMD Family 15h processor power monitoring

 *

 * Copyright (c) 2011 Advanced Micro Devices, Inc.

 * Author: Andreas Herrmann <andreas.herrmann3@amd.com>

 * Author: Andreas Herrmann <herrmann.der.user@googlemail.com>

 *

 *

 * This driver is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@ 
#include <asm/processor.h>



MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor");

MODULE_AUTHOR("Andreas Herrmann <andreas.herrmann3@amd.com>");

MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>");

MODULE_LICENSE("GPL");



/* D18F3 */

drivers/hwmon/gpio-fan.c

+2 −0
Original line number Diff line number Diff line
@@ -630,7 +630,9 @@ static struct platform_driver gpio_fan_driver = { 
	.driver	= {

		.name	= "gpio-fan",

		.pm	= GPIO_FAN_PM,

#ifdef CONFIG_OF_GPIO

		.of_match_table = of_match_ptr(of_gpio_fan_match),

#endif

	},

};