aboutsummaryrefslogtreecommitdiff
path: root/drivers/platform/x86
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2012-08-17 16:57:20 -0400
committerMatthew Garrett <mjg@redhat.com>2012-08-17 17:34:39 -0400
commit9f6f955ae4994dd4ad5513a0d959468763a45fa5 (patch)
tree35cc385e9e515a2b2981490117c30c976b8a0e09 /drivers/platform/x86
parent96ff705638e3d61b1e45a047c0f9f3bb622fa32f (diff)
downloadlinux-linaro-stable-9f6f955ae4994dd4ad5513a0d959468763a45fa5.tar.gz
apple_gmux: Fix ACPI video unregister
We were only calling acpi_video_unregister() if ACPI video support was built in, not if it was a module. Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r--drivers/platform/x86/apple-gmux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
index 0d140e1879e7..85e1bfbd1121 100644
--- a/drivers/platform/x86/apple-gmux.c
+++ b/drivers/platform/x86/apple-gmux.c
@@ -348,7 +348,7 @@ static int __devinit gmux_probe(struct pnp_dev *pnp,
* Disable the other backlight choices.
*/
acpi_video_dmi_promote_vendor();
-#ifdef CONFIG_ACPI_VIDEO
+#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE)
acpi_video_unregister();
#endif
apple_bl_unregister();
@@ -371,7 +371,7 @@ static void __devexit gmux_remove(struct pnp_dev *pnp)
kfree(gmux_data);
acpi_video_dmi_demote_vendor();
-#ifdef CONFIG_ACPI_VIDEO
+#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE)
acpi_video_register();
#endif
apple_bl_register();