public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] backlight: extend of_find_backlight_by_node stub-check to modules
@ 2014-11-04  0:59 Heiko Stübner
  2014-11-04  1:08 ` Jingoo Han
  2014-11-04  8:25 ` Lee Jones
  0 siblings, 2 replies; 3+ messages in thread
From: Heiko Stübner @ 2014-11-04  0:59 UTC (permalink / raw)
  To: Jingoo Han, Bryan Wu, Lee Jones; +Cc: linux-kernel

Commit de3d75dc2311 ("backlight: Use of_find_backlight_by_node stub when
backlight class disabled") did not take into account that the backlight
class can also be compiled as module. Extend the check to prevent
redefinition warnings when the backlight device class is compiled as module.

Reported-by: kbuild test robot
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 include/linux/backlight.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index d9cb644..92b9817 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -157,7 +157,8 @@ struct generic_bl_info {
 	void (*kick_battery)(void);
 };
 
-#if defined(CONFIG_OF) && defined(CONFIG_BACKLIGHT_CLASS_DEVICE)
+#if defined(CONFIG_OF) && (defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || \
+			   defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE))
 struct backlight_device *of_find_backlight_by_node(struct device_node *node);
 #else
 static inline struct backlight_device *
-- 
2.0.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-11-04  8:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-04  0:59 [PATCH] backlight: extend of_find_backlight_by_node stub-check to modules Heiko Stübner
2014-11-04  1:08 ` Jingoo Han
2014-11-04  8:25 ` Lee Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox