From e7650d7f83ae1a64b13c4d93761c796e32dd33e4 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 29 May 2012 15:07:14 -0700
Subject: [PATCH] --- yaml --- r: 308939 b: refs/heads/master c:
 1615d210dbc9c67c38b66bcff53233452dbaae22 h: refs/heads/master i:   308937:
 b321c3539bd4faf638a090e4e693c15f30a1f78b   308935:
 511eca9271df0b44e59ce286a846a1f92272b787 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/video/backlight/apple_bl.c | 1 +
 trunk/include/linux/apple_bl.h           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 04f9c3abba66..fc0eabe6897d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d54ad83f3d56228a42e1021b97fc52bfbad7d560
+refs/heads/master: 1615d210dbc9c67c38b66bcff53233452dbaae22
diff --git a/trunk/drivers/video/backlight/apple_bl.c b/trunk/drivers/video/backlight/apple_bl.c
index a523b255e124..ef5ca0d6cd20 100644
--- a/trunk/drivers/video/backlight/apple_bl.c
+++ b/trunk/drivers/video/backlight/apple_bl.c
@@ -25,6 +25,7 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/atomic.h>
+#include <linux/apple_bl.h>
 
 static struct backlight_device *apple_backlight_device;
 
diff --git a/trunk/include/linux/apple_bl.h b/trunk/include/linux/apple_bl.h
index 47bedc0eee69..0a95e730fcea 100644
--- a/trunk/include/linux/apple_bl.h
+++ b/trunk/include/linux/apple_bl.h
@@ -5,7 +5,7 @@
 #ifndef _LINUX_APPLE_BL_H
 #define _LINUX_APPLE_BL_H
 
-#ifdef CONFIG_BACKLIGHT_APPLE
+#if defined(CONFIG_BACKLIGHT_APPLE) || defined(CONFIG_BACKLIGHT_APPLE_MODULE)
 
 extern int apple_bl_register(void);
 extern void apple_bl_unregister(void);