summaryrefslogtreecommitdiff
path: root/drivers/video/aty/aty128fb.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-04 01:20:37 +0400
committerJeff Garzik <jeff@garzik.org>2006-08-04 01:20:37 +0400
commit23946a8a980d13af7b84bcf3ce023e0d166ec83f (patch)
tree193d2959a7b62b48aaf2236447f1378779e55104 /drivers/video/aty/aty128fb.c
parent66e8bb97055ff22a0e5ea89c0a75a35f8738cc96 (diff)
parent2b14c30b46e007a16c665cc86329bf4a1d9ff6ee (diff)
downloadlinux-23946a8a980d13af7b84bcf3ce023e0d166ec83f.tar.xz
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/video/aty/aty128fb.c')
-rw-r--r--drivers/video/aty/aty128fb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index c64a717e2d4b..8b08121b390b 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -455,7 +455,10 @@ static void do_wait_for_fifo(u16 entries, struct aty128fb_par *par);
static void wait_for_fifo(u16 entries, struct aty128fb_par *par);
static void wait_for_idle(struct aty128fb_par *par);
static u32 depth_to_dst(u32 depth);
+
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
static void aty128_bl_set_power(struct fb_info *info, int power);
+#endif
#define BIOS_IN8(v) (readb(bios + (v)))
#define BIOS_IN16(v) (readb(bios + (v)) | \