From c63e583b7d936f75d374092ea7a0096ed5e468e0 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Fri, 17 Aug 2012 16:57:20 -0400
Subject: [PATCH] --- yaml --- r: 321869 b: refs/heads/master c:
 9f6f955ae4994dd4ad5513a0d959468763a45fa5 h: refs/heads/master i:   321867:
 e1eb0fc087ceb368ba37386e60a121a267aa3d19 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/platform/x86/apple-gmux.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bb1df2a527f7..5eaf147d885e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96ff705638e3d61b1e45a047c0f9f3bb622fa32f
+refs/heads/master: 9f6f955ae4994dd4ad5513a0d959468763a45fa5
diff --git a/trunk/drivers/platform/x86/apple-gmux.c b/trunk/drivers/platform/x86/apple-gmux.c
index 0d140e1879e7..85e1bfbd1121 100644
--- a/trunk/drivers/platform/x86/apple-gmux.c
+++ b/trunk/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();