diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 23:01:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 23:01:23 +0100 |
| commit | 6e2324e0fbb3a075382359b1cbc392a3f4ec8792 (patch) | |
| tree | 3f2095838900eca866ce0d2dbe6b0b18aadf0df9 | |
| parent | [NETFILTER]: Use HOPLIMIT metric as TTL of TCP reset sent by REJECT (diff) | |
| parent | [ATYFB]: Fix onboard video on SPARC Blade 100 for 2.6.{13,14,15} (diff) | |
| download | linux-6e2324e0fbb3a075382359b1cbc392a3f4ec8792.tar.xz linux-6e2324e0fbb3a075382359b1cbc392a3f4ec8792.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
| -rw-r--r-- | drivers/video/aty/atyfb_base.c | 2 |
1 files changed, 1 insertions, 1 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 }, |