diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-11 17:56:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-11 17:56:41 -0500 |
| commit | b719f43059903820c31edb30f4663a2818836e7f (patch) | |
| tree | 34dc6268f3b2efb62e8bcf6bcba586a291c2343b | |
| parent | c727b4c63c9bf33c65351bbcc738161edb444b24 (diff) | |
| parent | 08245ad87e2970ac56987caab5cd5900563db4e1 (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull a hwmon patch from Guenter Roeck:
"Fix build error in vexpress driver"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (vexpress) Fix build error seen if CONFIG_OF_DEVICE is not set
| -rw-r--r-- | drivers/hwmon/vexpress.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/vexpress.c b/drivers/hwmon/vexpress.c index 86d7f6d858b1..d867e6bb2be1 100644 --- a/drivers/hwmon/vexpress.c +++ b/drivers/hwmon/vexpress.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/hwmon.h> | 19 | #include <linux/hwmon.h> |
| 20 | #include <linux/hwmon-sysfs.h> | 20 | #include <linux/hwmon-sysfs.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/of.h> | ||
| 22 | #include <linux/of_device.h> | 23 | #include <linux/of_device.h> |
| 23 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 24 | #include <linux/vexpress.h> | 25 | #include <linux/vexpress.h> |