diff --git a/debian/changelog b/debian/changelog index 33d456219..a54d01315 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,7 +44,13 @@ linux-2.6 (2.6.14+2.6.15-rc7-0experimental.1) UNRELEASED; urgency=low * [powerpc] Fixed apus patch for 2.6.15-rc7 (and beyond hopefully). * [powerpc] Fixed config options, but i guess jonas broke it again with his cleanup, oh well :) - + + [ Jurij Smakov ] + * [sparc] Correct the patch for the atyfb framebuffer driver + (sparc64-atyfb-xl-gr.patch) to finally fix the console and X + image defects on Blade 100/150. The new patch is named + sparc64-atyfb-xl-gr-final.patch to avoid the confusion. + -- Sven Luther Thu, 29 Dec 2005 09:48:36 +0000 linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low diff --git a/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1 b/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1 index 5c8c460f3..4ceb9f734 100644 --- a/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1 +++ b/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1 @@ -19,6 +19,6 @@ + m68k-mvme147.patch + m68k-mvme16x.patch + m68k-spinlock.patch -+ sparc64-atyfb-xl-gr.patch ++ sparc64-atyfb-xl-gr-final.patch + powerpc-arch-default-powerpc.patch + drivers-scsi-megaraid_splitup.patch diff --git a/debian/patches-debian/sparc64-atyfb-xl-gr.patch b/debian/patches-debian/sparc64-atyfb-xl-gr-final.patch similarity index 92% rename from debian/patches-debian/sparc64-atyfb-xl-gr.patch rename to debian/patches-debian/sparc64-atyfb-xl-gr-final.patch index 7c45bfdcf..03b47c1f7 100644 --- a/debian/patches-debian/sparc64-atyfb-xl-gr.patch +++ b/debian/patches-debian/sparc64-atyfb-xl-gr-final.patch @@ -6,7 +6,7 @@ diff -aur a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c { 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)", 230, 83, 63, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL }, ++ { 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 },