[RADEON FBDEV] Compile fixes.

diff --git a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c
index 25a2f3d441dfc500e68d1250c7da40d74ee527bf..d80b50310a777237051e8f44fd65d80a1764dc82 100644 (file)
--- a/drivers/video/radeonfb.c
+++ b/drivers/video/radeonfb.c
@@ -122,7 +122,7 @@ enum radeon_chips {
        RADEON_NE,
        RADEON_NF,
        RADEON_NG,
-       RADEON_QM       /* LN (my Radeon 9100) */
+       RADEON_QM
 };
 
 enum radeon_arch {
@@ -170,7 +170,7 @@ static struct radeon_chip_info {
        { "9700 NE", RADEON_R300 },
        { "9700 NF", 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 = {
        { 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_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, }
 };
 MODULE_DEVICE_TABLE(pci, radeonfb_pci_table);
@@ -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_NE:
                        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:
                                rinfo->pll.ppll_max = 40000;
                                rinfo->pll.ppll_min = 20000;
@@ -1310,7 +1300,6 @@ static int __devinit radeon_init_disp (struct radeonfb_info *rinfo)
        fb_alloc_cmap(&info->cmap, 256, 0);
 
        var.activate = FB_ACTIVATE_NOW;
-       fb_set_var(&var, info);
         return 0;
 }
 

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 9f97fb7c9cc1e5ba7b5534ff29748f993b792976..099131ef98b2c2c72735b3f6a15b5ba96e7d6b6c 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -287,6 +287,7 @@
 #define PCI_DEVICE_ID_ATI_RADEON_Ie    0x4965
 #define PCI_DEVICE_ID_ATI_RADEON_If    0x4966
 #define PCI_DEVICE_ID_ATI_RADEON_Ig    0x4967
+#define PCI_DEVICE_ID_ATI_RADEON_QM    0x514d
 /* Radeon R300 (9700) */
 #define PCI_DEVICE_ID_ATI_RADEON_ND    0x4e44
 #define PCI_DEVICE_ID_ATI_RADEON_NE    0x4e45