Author: waldi Date: Fri Jan 25 08:33:54 2008 New Revision: 10183 Log: * debian/patches/bugfix/ia64/hardcode-arch-script-output.patch, debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch: Fix. * debian/patches/bugfix/drivers-bus_to_virt.patch, debian/patches/bugfix/forcedeth-napi-broken.patch, debian/patches/features/alpha/isa-mapping-support.patch: Remove. * debian/patches/series/1~experimental.1: Remove old patches.
Removed: dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch dists/trunk/linux-2.6/debian/patches/bugfix/forcedeth-napi-broken.patch dists/trunk/linux-2.6/debian/patches/features/alpha/isa-mapping-support.patch Modified: dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Modified: dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch ============================================================================== --- dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch (original) +++ dists/trunk/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch Fri Jan 25 08:33:54 2008 @@ -5,7 +5,7 @@ CFLAGS_KERNEL := -mconstant-gp -GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)") --CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)") +-KBUILD_CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)") - -ifeq ($(GAS_STATUS),buggy) -$(error Sorry, you need a newer version of the assember, one that is built from \ @@ -14,7 +14,7 @@ - \ - ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz) -endif -+CPPFLAGS += -DHAVE_WORKING_TEXT_ALIGN -DHAVE_MODEL_SMALL_ATTRIBUTE -DHAVE_SERIALIZE_DIRECTIVE ++KBUILD_CPPFLAGS += -DHAVE_WORKING_TEXT_ALIGN -DHAVE_MODEL_SMALL_ATTRIBUTE -DHAVE_SERIALIZE_DIRECTIVE ifeq ($(call cc-version),0304) cflags-$(CONFIG_ITANIUM) += -mtune=merced @@ -32,7 +32,7 @@ $(Q)$(MAKE) $(build)=$(boot) $@ -unwcheck: vmlinux -- -$(Q)READELF=$(READELF) $(srctree)/arch/ia64/scripts/unwcheck.py $< +- -$(Q)READELF=$(READELF) python $(srctree)/arch/ia64/scripts/unwcheck.py $< - archclean: $(Q)$(MAKE) $(clean)=$(boot) Modified: dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch ============================================================================== --- dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch (original) +++ dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch Fri Jan 25 08:33:54 2008 @@ -2,12 +2,14 @@ index b952c58..5634cc1 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c -@@ -164,46 +164,6 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev); +@@ -164,48 +164,6 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev); static unsigned int in_module_init = 1; static const struct pci_device_id piix_pci_tbl[] = { - /* Intel PIIX3 for the 430HX etc */ - { 0x8086, 0x7010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_mwdma }, +- /* VMware ICH4 */ +- { 0x8086, 0x7111, 0x15ad, 0x1976, 0, 0, piix_pata_vmw }, - /* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */ - /* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */ - { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 }, @@ -33,7 +35,7 @@ - { 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - { 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - /* Intel ICH5 */ -- { 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 }, +- { 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - /* C-ICH (i810E2) */ - { 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - /* ESB (855GME/875P + 6300ESB) UDMA 100 */ @@ -41,7 +43,7 @@ - /* ICH6 (and 6) (i915) UDMA 100 */ - { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - /* ICH7/7-R (i945, i975) UDMA 100*/ -- { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 }, +- { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - /* ICH8 Mobile PATA Controller */ - { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 ============================================================================== --- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original) +++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Fri Jan 25 08:33:54 2008 @@ -5,7 +5,7 @@ + debian/powerpc-mkvmlinuz-support-ppc.patch + debian/powerpc-mkvmlinuz-support-powerpc.patch -#+ debian/drivers-ata-ata_piix-postpone-pata.patch ++ debian/drivers-ata-ata_piix-postpone-pata.patch + debian/dfsg/drivers-net-tg3-fix-simple.patch + features/all/export-gfs2-locking-symbols.patch @@ -23,11 +23,8 @@ + features/arm/nas100d-mac_plat_info.patch + features/arm/nslu2-setup-mac.patch + features/arm/nas100d-setup-mac.patch -#+ bugfix/drivers-bus_to_virt.patch + bugfix/sparc/drivers_net-broken.patch -#+ bugfix/forcedeth-napi-broken.patch -#+ bugfix/ia64/hardcode-arch-script-output.patch -#+ features/alpha/isa-mapping-support.patch ++ bugfix/ia64/hardcode-arch-script-output.patch + bugfix/powerpc/libgcc-__ucmpdi2.patch + bugfix/mips/disable-advansys.patch + bugfix/arm/disable-dvb_b2c2_flexcop.patch _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes