aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-05 14:01:23 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-05 14:01:23 -0800
commit6e2324e0fbb3a075382359b1cbc392a3f4ec8792 (patch)
tree3f2095838900eca866ce0d2dbe6b0b18aadf0df9
parente8eaedf2f8b368c26aa31a5a5a623b6867ef7f2b (diff)
parent5b373e10aeadc2599c085a3357b7fad8b8e760b8 (diff)
downloadkernel_samsung_smdk4412-6e2324e0fbb3a075382359b1cbc392a3f4ec8792.zip
kernel_samsung_smdk4412-6e2324e0fbb3a075382359b1cbc392a3f4ec8792.tar.gz
kernel_samsung_smdk4412-6e2324e0fbb3a075382359b1cbc392a3f4ec8792.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
-rw-r--r--drivers/video/aty/atyfb_base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 08edbfc..3fefdb0c 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 },