projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'platform-drivers-x86-v4.2-1' of git://git.infradead.org/users/dvhart/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
platform
/
x86
/
dell-laptop.c
diff --git
a/drivers/platform/x86/dell-laptop.c
b/drivers/platform/x86/dell-laptop.c
index 83e3d7f9d923c34c71c5baa63adbf6af55d79900..35de903cb506b3bdf74dd0a3b265f944722b534d 100644
(file)
--- a/
drivers/platform/x86/dell-laptop.c
+++ b/
drivers/platform/x86/dell-laptop.c
@@
-31,6
+31,7
@@
#include <linux/slab.h>
#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/debugfs.h>
#include <linux/seq_file.h>
+#include <acpi/video.h>
#include "../../firmware/dcdbas.h"
#include "dell-rbtn.h"
#include "../../firmware/dcdbas.h"
#include "dell-rbtn.h"
@@
-1995,13
+1996,8
@@
static int __init dell_init(void)
debugfs_create_file("rfkill", 0444, dell_laptop_dir, NULL,
&dell_debugfs_fops);
debugfs_create_file("rfkill", 0444, dell_laptop_dir, NULL,
&dell_debugfs_fops);
-#ifdef CONFIG_ACPI
- /* In the event of an ACPI backlight being available, don't
- * register the platform controller.
- */
- if (acpi_video_backlight_support())
+ if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
return 0;
return 0;
-#endif
get_buffer();
buffer->input[0] = find_token_location(BRIGHTNESS_TOKEN);
get_buffer();
buffer->input[0] = find_token_location(BRIGHTNESS_TOKEN);