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/samsung-laptop.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/samsung-laptop.c')
-rw-r--r-- | drivers/platform/x86/samsung-laptop.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c index c1ca7bcebb6..dd90d15f521 100644 --- a/drivers/platform/x86/samsung-laptop.c +++ b/drivers/platform/x86/samsung-laptop.c | |||
@@ -26,9 +26,7 @@ | |||
26 | #include <linux/seq_file.h> | 26 | #include <linux/seq_file.h> |
27 | #include <linux/debugfs.h> | 27 | #include <linux/debugfs.h> |
28 | #include <linux/ctype.h> | 28 | #include <linux/ctype.h> |
29 | #ifdef CONFIG_ACPI_VIDEO | ||
30 | #include <acpi/video.h> | 29 | #include <acpi/video.h> |
31 | #endif | ||
32 | 30 | ||
33 | /* | 31 | /* |
34 | * This driver is needed because a number of Samsung laptops do not hook | 32 | * This driver is needed because a number of Samsung laptops do not hook |
@@ -1558,9 +1556,7 @@ static int __init samsung_init(void) | |||
1558 | samsung->handle_backlight = false; | 1556 | samsung->handle_backlight = false; |
1559 | } else if (samsung->quirks->broken_acpi_video) { | 1557 | } else if (samsung->quirks->broken_acpi_video) { |
1560 | pr_info("Disabling ACPI video driver\n"); | 1558 | pr_info("Disabling ACPI video driver\n"); |
1561 | #ifdef CONFIG_ACPI_VIDEO | ||
1562 | acpi_video_unregister(); | 1559 | acpi_video_unregister(); |
1563 | #endif | ||
1564 | } | 1560 | } |
1565 | #endif | 1561 | #endif |
1566 | 1562 | ||