Commit 470d3cc3 authored by James Simmons's avatar James Simmons

[RADEON FBDEV] Compile fixes.

parent 1e1b793f
...@@ -122,7 +122,7 @@ enum radeon_chips { ...@@ -122,7 +122,7 @@ enum radeon_chips {
RADEON_NE, RADEON_NE,
RADEON_NF, RADEON_NF,
RADEON_NG, RADEON_NG,
RADEON_QM /* LN (my Radeon 9100) */ RADEON_QM
}; };
enum radeon_arch { enum radeon_arch {
...@@ -170,7 +170,7 @@ static struct radeon_chip_info { ...@@ -170,7 +170,7 @@ static struct radeon_chip_info {
{ "9700 NE", RADEON_R300 }, { "9700 NE", RADEON_R300 },
{ "9700 NF", RADEON_R300 }, { "9700 NF", RADEON_R300 },
{ "9700 NG", RADEON_R300 }, { "9700 NG", RADEON_R300 },
{ "9100 QM", RADEON_R200 } /* LN (my Radeon 9100) */ { "9100 QM", RADEON_R200 }
}; };
...@@ -215,7 +215,7 @@ static struct pci_device_id radeonfb_pci_table[] __devinitdata = { ...@@ -215,7 +215,7 @@ static struct pci_device_id radeonfb_pci_table[] __devinitdata = {
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_NE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_NE}, { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_NE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_NE},
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_NF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_NF}, { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_NF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_NF},
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_NG, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_NG}, { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_NG, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_NG},
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_QM}, /* LN (my Radeon 9100) */ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_QM},
{ 0, } { 0, }
}; };
MODULE_DEVICE_TABLE(pci, radeonfb_pci_table); MODULE_DEVICE_TABLE(pci, radeonfb_pci_table);
...@@ -887,16 +887,6 @@ static void radeon_get_pllinfo(struct radeonfb_info *rinfo, char *bios_seg) ...@@ -887,16 +887,6 @@ static void radeon_get_pllinfo(struct radeonfb_info *rinfo, char *bios_seg)
case PCI_DEVICE_ID_ATI_RADEON_ND: case PCI_DEVICE_ID_ATI_RADEON_ND:
case PCI_DEVICE_ID_ATI_RADEON_NE: case PCI_DEVICE_ID_ATI_RADEON_NE:
case PCI_DEVICE_ID_ATI_RADEON_NF: case PCI_DEVICE_ID_ATI_RADEON_NF:
case PCI_DEVICE_ID_ATI_RADEON_NG:
rinfo->pll.ppll_max = 40000;
rinfo->pll.ppll_min = 20000;
rinfo->pll.xclk = 27000;
rinfo->pll.ref_div = 12;
rinfo->pll.ref_clk = 2700;
break;
case PCI_DEVICE_ID_ATI_RADEON_ND:
case PCI_DEVICE_ID_ATI_RADEON_NE:
case PCI_DEVICE_ID_ATI_RADEON_NF:
case PCI_DEVICE_ID_ATI_RADEON_NG: case PCI_DEVICE_ID_ATI_RADEON_NG:
rinfo->pll.ppll_max = 40000; rinfo->pll.ppll_max = 40000;
rinfo->pll.ppll_min = 20000; rinfo->pll.ppll_min = 20000;
...@@ -1310,7 +1300,6 @@ static int __devinit radeon_init_disp (struct radeonfb_info *rinfo) ...@@ -1310,7 +1300,6 @@ static int __devinit radeon_init_disp (struct radeonfb_info *rinfo)
fb_alloc_cmap(&info->cmap, 256, 0); fb_alloc_cmap(&info->cmap, 256, 0);
var.activate = FB_ACTIVATE_NOW; var.activate = FB_ACTIVATE_NOW;
fb_set_var(&var, info);
return 0; return 0;
} }
......
...@@ -287,6 +287,7 @@ ...@@ -287,6 +287,7 @@
#define PCI_DEVICE_ID_ATI_RADEON_Ie 0x4965 #define PCI_DEVICE_ID_ATI_RADEON_Ie 0x4965
#define PCI_DEVICE_ID_ATI_RADEON_If 0x4966 #define PCI_DEVICE_ID_ATI_RADEON_If 0x4966
#define PCI_DEVICE_ID_ATI_RADEON_Ig 0x4967 #define PCI_DEVICE_ID_ATI_RADEON_Ig 0x4967
#define PCI_DEVICE_ID_ATI_RADEON_QM 0x514d
/* Radeon R300 (9700) */ /* Radeon R300 (9700) */
#define PCI_DEVICE_ID_ATI_RADEON_ND 0x4e44 #define PCI_DEVICE_ID_ATI_RADEON_ND 0x4e44
#define PCI_DEVICE_ID_ATI_RADEON_NE 0x4e45 #define PCI_DEVICE_ID_ATI_RADEON_NE 0x4e45
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment