dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

staging: xgifb: delete unused LINUXBIOS code 

Delete unused LINUXBIOS code.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen 2011-03-13 12:26:11 +02:00 committed by Greg Kroah-Hartman
parent 0658733528
commit 38583420d3
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/xgifb/XGI_main.h
View File

@ -9,8 +9,6 @@
#include "vb_struct.h"
#include "vb_def.h"
//#define LINUXBIOS /* turn this on when compiling for LINUXBIOS */
#define XGIFAIL(x) do { printk(x "\n"); return -EINVAL; } while(0)
#define VER_MAJOR 0

27
drivers/staging/xgifb/XGI_main_26.c
View File

@ -2265,34 +2265,10 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
/* Mapping Max FB Size for 315 Init */
XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) {
#ifdef LINUXBIOS
printk("XGIfb: XGIInit() ...");
/* XGIInitNewt for LINUXBIOS only */
if (XGIInitNew(&XGIhw_ext))
printk("OK\n");
else
printk("Fail\n");
#endif
outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
}
}
#ifdef LINUXBIOS
else {
XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) {
outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
/* yilin Because no VBIOS DRAM Sizing, Dram size will error. */
/* Set SR13 ,14 temporarily for UDtech */
outXGIIDXREG(XGISR, 0x13, 0x45);
outXGIIDXREG(XGISR, 0x14, 0x51);
}
}
#endif
if (XGIfb_get_dram_size()) {
printk(KERN_INFO "XGIfb: Fatal error: Unable to determine RAM size.\n");
ret = -ENODEV;
@ -2459,7 +2435,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
XGIfb_detectedpdc = 0;
XGIfb_detectedlcda = 0xff;
#ifndef LINUXBIOS
/* TW: Try to find about LCDA */
@ -2492,8 +2467,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
}
#endif
if (xgifb_mode_idx >= 0)
xgifb_mode_idx = XGIfb_validate_mode(xgifb_mode_idx);