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 <[email protected]> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
