Merge with Linus' kernel.

3 files changed, 12 insertions, 17 deletions

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 08edbfcfca58..3fefdb0cbf07 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -403,7 +403,7 @@ static struct {
         { PCI_CHIP_MACH64GM, "3D RAGE XL (Mach64 GM, AGP)", 230, 83, 63, ATI_CHIP_264XL },
         { PCI_CHIP_MACH64GN, "3D RAGE XL (Mach64 GN, AGP)", 230, 83, 63, ATI_CHIP_264XL },
         { PCI_CHIP_MACH64GO, "3D RAGE XL (Mach64 GO, PCI-66/BGA)", 230, 83, 63, ATI_CHIP_264XL },
-        { PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33MHz)", 230, 83, 63, ATI_CHIP_264XL },
+        { PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33MHz)", 235, 83, 63, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL },
         { PCI_CHIP_MACH64GL, "3D RAGE XL (Mach64 GL, PCI)", 230, 83, 63, ATI_CHIP_264XL },
         { PCI_CHIP_MACH64GS, "3D RAGE XL (Mach64 GS, PCI)", 230, 83, 63, ATI_CHIP_264XL },
 
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 4f01ccc02aa4..156db84cb363 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -594,7 +594,7 @@ static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo)
 }
 
 /*
- * Retreive PLL infos by different means (BIOS, Open Firmware, register probing...)
+ * Retrieve PLL infos by different means (BIOS, Open Firmware, register probing...)
  */
 static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
 {
@@ -660,17 +660,17 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
 
 #ifdef CONFIG_PPC_OF
         /*
-         * Retreive PLL infos from Open Firmware first
+         * Retrieve PLL infos from Open Firmware first
          */
         if (!force_measure_pll && radeon_read_xtal_OF(rinfo) == 0) {
-                printk(KERN_INFO "radeonfb: Retreived PLL infos from Open Firmware\n");
+                printk(KERN_INFO "radeonfb: Retrieved PLL infos from Open Firmware\n");
                 goto found;
         }
 #endif /* CONFIG_PPC_OF */
 
         /*
          * Check out if we have an X86 which gave us some PLL informations
-         * and if yes, retreive them
+         * and if yes, retrieve them
          */
         if (!force_measure_pll && rinfo->bios_seg) {
                 u16 pll_info_block = BIOS_IN16(rinfo->fp_bios_start + 0x30);
@@ -682,7 +682,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
                 rinfo->pll.ppll_min     = BIOS_IN32(pll_info_block + 0x12);
                 rinfo->pll.ppll_max     = BIOS_IN32(pll_info_block + 0x16);
 
-                printk(KERN_INFO "radeonfb: Retreived PLL infos from BIOS\n");
+                printk(KERN_INFO "radeonfb: Retrieved PLL infos from BIOS\n");
                 goto found;
         }
 
@@ -691,7 +691,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
          * probe them
          */
         if (radeon_probe_pll_params(rinfo) == 0) {
-                printk(KERN_INFO "radeonfb: Retreived PLL infos from registers\n");
+                printk(KERN_INFO "radeonfb: Retrieved PLL infos from registers\n");
                 goto found;
         }
 
@@ -702,7 +702,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
 
 found:
         /*
-         * Some methods fail to retreive SCLK and MCLK values, we apply default
+         * Some methods fail to retrieve SCLK and MCLK values, we apply default
          * settings in this case (200Mhz). If that really happne often, we could
          * fetch from registers instead...
          */
@@ -2393,7 +2393,7 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
                rinfo->mapped_vram/1024);
 
         /*
-         * Map the BIOS ROM if any and retreive PLL parameters from
+         * Map the BIOS ROM if any and retrieve PLL parameters from
          * the BIOS. We skip that on mobility chips as the real panel
          * values we need aren't in the ROM but in the BIOS image in
          * memory. This is definitely not the best meacnism though,
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index ad60bbb16cdf..a1f2c5e8fc88 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1288,18 +1288,13 @@ static int maven_detach_client(struct i2c_client* client) {
         return 0;
 }
 
-static int maven_command(struct i2c_client* client, unsigned int cmd, void* arg) {
-        return -ENOIOCTLCMD;    /* or -EINVAL, depends on who will call this */
-}
-
 static struct i2c_driver maven_driver={
-        .owner          = THIS_MODULE,
-        .name           = "maven",
+        .driver = {
+                .name   = "maven",
+        },
         .id             = I2C_DRIVERID_MGATVO,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = maven_attach_adapter,
         .detach_client  = maven_detach_client,
-        .command        = maven_command,
 };
 
 /* ************************** */