diff options
| author | Len Brown <len.brown@intel.com> | 2007-11-20 01:20:42 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-20 01:20:42 -0500 |
| commit | d12dbbfe948c89156ad1b0fe7c808ba4d6f00bc2 (patch) | |
| tree | bc653ac4e505e5cba8ecf8186e2e8e32758d911c /drivers/misc/thinkpad_acpi.h | |
| parent | 614a6bbecceb97558819f18a676fd819ea61550b (diff) | |
| parent | 59f91ff11e594913a5b3c03a4707fdf02338c8df (diff) | |
| download | blackbird-op-linux-d12dbbfe948c89156ad1b0fe7c808ba4d6f00bc2.tar.gz blackbird-op-linux-d12dbbfe948c89156ad1b0fe7c808ba4d6f00bc2.zip | |
Pull thinkpad-2.6.24 into release branch
Diffstat (limited to 'drivers/misc/thinkpad_acpi.h')
| -rw-r--r-- | drivers/misc/thinkpad_acpi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h index 3abcc8120634..8fba2bbe345e 100644 --- a/drivers/misc/thinkpad_acpi.h +++ b/drivers/misc/thinkpad_acpi.h @@ -84,7 +84,7 @@ /* ThinkPad CMOS NVRAM constants */ #define TP_NVRAM_ADDR_BRIGHTNESS 0x5e -#define TP_NVRAM_MASK_LEVEL_BRIGHTNESS 0x07 +#define TP_NVRAM_MASK_LEVEL_BRIGHTNESS 0x0f #define TP_NVRAM_POS_LEVEL_BRIGHTNESS 0 #define onoff(status,bit) ((status) & (1 << (bit)) ? "on" : "off") @@ -246,6 +246,7 @@ static struct { u32 hotkey_wlsw:1; u32 light:1; u32 light_status:1; + u32 bright_16levels:1; u32 wan:1; u32 fan_ctrl_status_undef:1; u32 input_device_registered:1; @@ -338,6 +339,7 @@ static int bluetooth_write(char *buf); static struct backlight_device *ibm_backlight_device; static int brightness_offset = 0x31; static int brightness_mode; +static unsigned int brightness_enable; /* 0 = no, 1 = yes, 2 = auto */ static int brightness_init(struct ibm_init_struct *iibm); static void brightness_exit(void); |
