diff options
Diffstat (limited to 'drivers/platform/x86/thinkpad_acpi.c')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 28f328136f0d..33e488cf5569 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -83,6 +83,7 @@  #include <sound/control.h>  #include <sound/initval.h>  #include <asm/uaccess.h> +#include <acpi/video.h>  /* ThinkPad CMOS commands */  #define TP_CMOS_VOLUME_DOWN	0 @@ -3487,7 +3488,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)  	/* Do not issue duplicate brightness change events to  	 * userspace. tpacpi_detect_brightness_capabilities() must have  	 * been called before this point  */ -	if (acpi_video_backlight_support()) { +	if (acpi_video_get_backlight_type() != acpi_backlight_vendor) {  		pr_info("This ThinkPad has standard ACPI backlight "  			"brightness control, supported by the ACPI "  			"video driver\n"); @@ -6491,7 +6492,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm)  		return 1;  	} -	if (acpi_video_backlight_support()) { +	if (acpi_video_get_backlight_type() != acpi_backlight_vendor) {  		if (brightness_enable > 1) {  			pr_info("Standard ACPI backlight interface "  				"available, not loading native one\n");  |