patch-2.2.18 linux/drivers/video/chipsfb.c

• Lines: 44
• Date: Wed Nov 8 23:00:35 2000
• Orig file: v2.2.17/drivers/video/chipsfb.c
• Orig date: Sat Sep 9 18:42:46 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/video/chipsfb.c linux/drivers/video/chipsfb.c
@@ -37,6 +37,7 @@
 #include <asm/pci-bridge.h>
 #include <asm/adb.h>
 #include <asm/pmu.h>
+#include <asm/backlight.h>
 
 #include <video/fbcon.h>
 #include <video/fbcon-cfb8.h>
@@ -281,7 +282,7 @@
 	// used to disable backlight only for blank > 1, but it seems
 	// useful at blank = 1 too (saves battery, extends backlight life)
 	if (blank) {
-		pmu_enable_backlight(0);
+		set_backlight_enable(0);
 		/* get the palette from the chip */
 		for (i = 0; i < 256; ++i) {
 			out_8(p->io_base + 0x3c7, i);
@@ -298,7 +299,7 @@
 			out_8(p->io_base + 0x3c9, 0);
 		}
 	} else {
-		pmu_enable_backlight(1);
+		set_backlight_enable(1);
 		for (i = 0; i < 256; ++i) {
 			out_8(p->io_base + 0x3c8, i);
 			udelay(1);
@@ -417,7 +418,7 @@
 	disp->visual = fix->visual;
 	disp->var = *var;
 
-#if (defined(CONFIG_PMAC_PBOOK) || defined(CONFIG_FB_COMPAT_XPMAC))
+#ifdef CONFIG_FB_COMPAT_XPMAC
 	display_info.depth = bpp;
 	display_info.pitch = fix->line_length;
 #endif
@@ -707,7 +708,7 @@
 	memset(p->frame_buffer, 0, 0x100000);
 
 	/* turn on the backlight */
-	pmu_enable_backlight(1);
+	set_backlight_enable(1);
 
 	init_chips(p);
 }