[PATCH] fix hardcoded values in collie frontlight

In frontlight support, we should really use values from flash-ROM instead
of hardcoding our own.  Cleanup includes.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 10 insertions, 13 deletions

diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index ada6e75eb048..60831bb23685 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -20,14 +20,10 @@
 
 #include <asm/hardware/locomo.h>
 #include <asm/irq.h>
+#include <asm/mach/sharpsl_param.h>
+#include <asm/mach-types.h>
 
-#ifdef CONFIG_SA1100_COLLIE
-#include <asm/arch/collie.h>
-#else
-#include <asm/arch/poodle.h>
-#endif
-
-extern void (*sa1100fb_lcd_power)(int on);
+#include "../../../arch/arm/mach-sa1100/generic.h"
 
 static struct locomo_dev *locomolcd_dev;
 
@@ -82,7 +78,7 @@ static void locomolcd_off(int comadj)
 
 void locomolcd_power(int on)
 {
-        int comadj = 118;
+        int comadj = sharpsl_param.comadj;
         unsigned long flags;
 
         local_irq_save(flags);
@@ -93,11 +89,12 @@ void locomolcd_power(int on)
         }
 
         /* read comadj */
-#ifdef CONFIG_MACH_POODLE
-        comadj = 118;
-#else
-        comadj = 128;
-#endif
+        if (comadj == -1) {
+                if (machine_is_poodle())
+                        comadj = 118;
+                if (machine_is_collie())
+                        comadj = 128;
+        }
 
         if (on)
                 locomolcd_on(comadj);