Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/pwm_backlight.h b/include/linux/pwm_backlight.h
index e031e1a486d9..5e3e25a3c9c3 100644
--- a/include/linux/pwm_backlight.h
+++ b/include/linux/pwm_backlight.h
@@ -4,6 +4,8 @@
 #ifndef __LINUX_PWM_BACKLIGHT_H
 #define __LINUX_PWM_BACKLIGHT_H
 
+#include <linux/backlight.h>
+
 struct platform_pwm_backlight_data {
         int pwm_id;
         unsigned int max_brightness;
@@ -13,6 +15,7 @@ struct platform_pwm_backlight_data {
         int (*init)(struct device *dev);
         int (*notify)(struct device *dev, int brightness);
         void (*exit)(struct device *dev);
+        int (*check_fb)(struct device *dev, struct fb_info *info);
 };
 
 #endif