aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-11 14:56:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-11 14:56:41 -0800
commitb719f43059903820c31edb30f4663a2818836e7f (patch)
tree34dc6268f3b2efb62e8bcf6bcba586a291c2343b
parentMerge branch 'akpm' (incoming fixes from Andrew) (diff)
parenthwmon: (vexpress) Fix build error seen if CONFIG_OF_DEVICE is not set (diff)
downloadlinux-dev-b719f43059903820c31edb30f4663a2818836e7f.tar.xz
linux-dev-b719f43059903820c31edb30f4663a2818836e7f.zip
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.c1
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 @@
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/module.h>
+#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/vexpress.h>