summaryrefslogtreecommitdiffstats
path: root/drivers/video/aty/xlinit.c
diff options
context:
space:
mode:
authorTom 'spot' Callaway <tcallawa@redhat.com>2005-09-21 09:29:16 +0200
committerDavid S. Miller <davem@davemloft.net>2005-09-21 09:29:16 +0200
commit1a3e64aa480101d11d8cac94ca57fd8bbe2536b7 (patch)
tree371ca21e83c83ccabe48484f9f62078232d4660a /drivers/video/aty/xlinit.c
parent[SPARC64]: Verify vmalloc TLB misses more strictly. (diff)
downloadlinux-1a3e64aa480101d11d8cac94ca57fd8bbe2536b7.tar.xz
linux-1a3e64aa480101d11d8cac94ca57fd8bbe2536b7.zip
[ATYFB]: Fix build with CONFIG_FB_ATY_GENERIC_LCD disabled.
Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/video/aty/xlinit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/aty/xlinit.c b/drivers/video/aty/xlinit.c
index 92643af12581..0bea0d8d7821 100644
--- a/drivers/video/aty/xlinit.c
+++ b/drivers/video/aty/xlinit.c
@@ -174,7 +174,7 @@ int atyfb_xl_init(struct fb_info *info)
const struct xl_card_cfg_t * card = &card_cfg[xl_card];
struct atyfb_par *par = (struct atyfb_par *) info->par;
union aty_pll pll;
- int i, err;
+ int err;
u32 temp;
aty_st_8(CONFIG_STAT0, 0x85, par);
@@ -252,9 +252,12 @@ int atyfb_xl_init(struct fb_info *info)
aty_st_le32(0xEC, 0x00000000, par);
aty_st_le32(0xFC, 0x00000000, par);
+#if defined (CONFIG_FB_ATY_GENERIC_LCD)
+ int i;
for (i=0; i<sizeof(lcd_tbl)/sizeof(lcd_tbl_t); i++) {
aty_st_lcd(lcd_tbl[i].lcd_reg, lcd_tbl[i].val, par);
}
+#endif
aty_st_le16(CONFIG_STAT0, 0x00A4, par);
mdelay(10);