path: root/include
diff options
authorRafael J. Wysocki <rjw@sisk.pl>2011-03-01 01:12:19 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-28 18:00:31 -0800
commitaf06216a8ef1c430cc6ad22b562f3a11a512c5dd (patch)
tree8c258db7e165cc160a8c85c3d06afa5f1e07a063 /include
parentdbc39ec4b69de34e2c2c937131649cc4a104283f (diff)
ACPI: Fix build for CONFIG_NET unset
Several ACPI drivers fail to build if CONFIG_NET is unset, because they refer to things depending on CONFIG_THERMAL that in turn depends on CONFIG_NET. However, CONFIG_THERMAL doesn't really need to depend on CONFIG_NET, because the only part of it requiring CONFIG_NET is the netlink interface in thermal_sys.c. Put the netlink interface in thermal_sys.c under #ifdef CONFIG_NET and remove the dependency of CONFIG_THERMAL on CONFIG_NET from drivers/thermal/Kconfig. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Len Brown <lenb@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Luming Yu <luming.yu@intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 8651556dbd5..d3ec89fb412 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -172,6 +172,14 @@ void thermal_zone_device_update(struct thermal_zone_device *);
struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
const struct thermal_cooling_device_ops *);
void thermal_cooling_device_unregister(struct thermal_cooling_device *);
+#ifdef CONFIG_NET
extern int generate_netlink_event(u32 orig, enum events event);
+static inline int generate_netlink_event(u32 orig, enum events event)
+ return 0;
#endif /* __THERMAL_H__ */