Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / include / linux / backlight.h

diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index 4a3d52e..5ffc6dd 100644 (file)
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -32,6 +32,13 @@ enum backlight_update_reason {
        BACKLIGHT_UPDATE_SYSFS,
 };
 
+enum backlight_type {
+       BACKLIGHT_RAW = 1,
+       BACKLIGHT_PLATFORM,
+       BACKLIGHT_FIRMWARE,
+       BACKLIGHT_TYPE_MAX,
+};
+
 struct backlight_device;
 struct fb_info;
 
@@ -62,6 +69,8 @@ struct backlight_properties {
        /* FB Blanking active? (values as for power) */
        /* Due to be removed, please use (state & BL_CORE_FBBLANK) */
        int fb_blank;
+       /* Backlight type */
+       enum backlight_type type;
        /* Flags used to signal drivers of state changes */
        /* Upper 4 bits are reserved for driver internal use */
        unsigned int state;