diff options
author | Corentin Chary <corentin.chary@gmail.com> | 2012-08-20 17:01:50 -0400 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2012-09-13 16:46:30 -0400 |
commit | 689db7843d503fae0eb46cb849e4caab35588170 (patch) | |
tree | 78c9924568f5a57572df96633a127ee631e37d7b /drivers/platform/x86/asus-wmi.c | |
parent | e6d9d3d59ca08fc87688c5953061b4da0d17bf15 (diff) |
drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86/asus-wmi.c')
-rw-r--r-- | drivers/platform/x86/asus-wmi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 2eb9fe8e8ef..c0e9ff489b2 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c | |||
@@ -47,9 +47,7 @@ | |||
47 | #include <linux/thermal.h> | 47 | #include <linux/thermal.h> |
48 | #include <acpi/acpi_bus.h> | 48 | #include <acpi/acpi_bus.h> |
49 | #include <acpi/acpi_drivers.h> | 49 | #include <acpi/acpi_drivers.h> |
50 | #ifdef CONFIG_ACPI_VIDEO | ||
51 | #include <acpi/video.h> | 50 | #include <acpi/video.h> |
52 | #endif | ||
53 | 51 | ||
54 | #include "asus-wmi.h" | 52 | #include "asus-wmi.h" |
55 | 53 | ||
@@ -1704,10 +1702,8 @@ static int asus_wmi_add(struct platform_device *pdev) | |||
1704 | if (asus->driver->quirks->wmi_backlight_power) | 1702 | if (asus->driver->quirks->wmi_backlight_power) |
1705 | acpi_video_dmi_promote_vendor(); | 1703 | acpi_video_dmi_promote_vendor(); |
1706 | if (!acpi_video_backlight_support()) { | 1704 | if (!acpi_video_backlight_support()) { |
1707 | #ifdef CONFIG_ACPI_VIDEO | ||
1708 | pr_info("Disabling ACPI video driver\n"); | 1705 | pr_info("Disabling ACPI video driver\n"); |
1709 | acpi_video_unregister(); | 1706 | acpi_video_unregister(); |
1710 | #endif | ||
1711 | err = asus_wmi_backlight_init(asus); | 1707 | err = asus_wmi_backlight_init(asus); |
1712 | if (err && err != -ENODEV) | 1708 | if (err && err != -ENODEV) |
1713 | goto fail_backlight; | 1709 | goto fail_backlight; |