diff --git a/debian/changelog b/debian/changelog index db96be4d2..5e2409cbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ linux-2.6 (2.6.18-4) UNRELEASED; urgency=low * [alpha] Switched to gcc-4.1. * Bumped ABI revision because of compiler switch on alpha. + [ Jurij Smakov ] + * [sparc] Remove sparc64-atyfb-xl-gr.patch, it does more harm than + good in 2.6.18. + -- Norbert Tretkowski Sat, 21 Oct 2006 18:52:12 +0200 linux-2.6 (2.6.18-3) unstable; urgency=low diff --git a/debian/patches/series/4 b/debian/patches/series/4 new file mode 100644 index 000000000..27ba583d5 --- /dev/null +++ b/debian/patches/series/4 @@ -0,0 +1 @@ +- sparc64-atyfb-xl-gr.patch diff --git a/debian/patches/sparc64-atyfb-xl-gr.patch b/debian/patches/sparc64-atyfb-xl-gr.patch deleted file mode 100644 index c539008cb..000000000 --- a/debian/patches/sparc64-atyfb-xl-gr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/video/aty/atyfb_base.c 2006-02-03 05:23:59.000000000 -0800 -+++ b/drivers/video/aty/atyfb_base.c 2006-02-09 21:25:53.163445232 -0800 -@@ -415,7 +415,7 @@ - { PCI_CHIP_MACH64GN, "3D RAGE XC (Mach64 GN, AGP 2x)", 230, 83, 63, 135, ATI_CHIP_264XL }, - { PCI_CHIP_MACH64GO, "3D RAGE XL (Mach64 GO, PCI-66)", 230, 83, 63, 135, ATI_CHIP_264XL }, - { PCI_CHIP_MACH64GL, "3D RAGE XC (Mach64 GL, PCI-66)", 230, 83, 63, 135, ATI_CHIP_264XL }, -- { PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33)", 230, 83, 63, 135, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL }, -+ { PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33)", 235, 83, 63, 135, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL }, - { PCI_CHIP_MACH64GS, "3D RAGE XC (Mach64 GS, PCI-33)", 230, 83, 63, 135, ATI_CHIP_264XL }, - - { PCI_CHIP_MACH64LM, "3D RAGE Mobility P/M (Mach64 LM, AGP 2x)", 230, 83, 125, 135, ATI_CHIP_MOBILITY },