rpms/kernel/F-7 linux-2.6-libata-setxfer.patch,1.1,1.2

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4816

Modified Files:
	linux-2.6-libata-setxfer.patch 
Log Message:
build fix.

linux-2.6-libata-setxfer.patch:

Index: linux-2.6-libata-setxfer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-libata-setxfer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-libata-setxfer.patch	5 Jun 2007 17:54:04 -0000	1.1
+++ linux-2.6-libata-setxfer.patch	6 Jun 2007 22:40:09 -0000	1.2
@@ -46,3 +46,59 @@
  	ATA_FLAG_ACPI_SATA	= (1 << 17), /* need native SATA ACPI layout */
 
 -
+--- linux-2.6.21.noarch/drivers/ata/pata_via.c~	2007-06-06 18:39:14.000000000 -0400
++++ linux-2.6.21.noarch/drivers/ata/pata_via.c	2007-06-06 18:39:48.000000000 -0400
+@@ -429,7 +429,7 @@ static int via_init_one(struct pci_dev *
+ 	/* Early VIA without UDMA support */
+ 	static struct ata_port_info via_mwdma_info = {
+ 		.sht = &via_sht,
+-		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
++		.flags = ATA_FLAG_SLAVE_POSS,
+ 		.pio_mask = 0x1f,
+ 		.mwdma_mask = 0x07,
+ 		.port_ops = &via_port_ops
+@@ -437,7 +437,7 @@ static int via_init_one(struct pci_dev *
+ 	/* Ditto with IRQ masking required */
+ 	static struct ata_port_info via_mwdma_info_borked = {
+ 		.sht = &via_sht,
+-		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
++		.flags = ATA_FLAG_SLAVE_POSS,
+ 		.pio_mask = 0x1f,
+ 		.mwdma_mask = 0x07,
+ 		.port_ops = &via_port_ops_noirq,
+@@ -445,7 +445,7 @@ static int via_init_one(struct pci_dev *
+ 	/* VIA UDMA 33 devices (and borked 66) */
+ 	static struct ata_port_info via_udma33_info = {
+ 		.sht = &via_sht,
+-		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
++		.flags = ATA_FLAG_SLAVE_POSS,
+ 		.pio_mask = 0x1f,
+ 		.mwdma_mask = 0x07,
+ 		.udma_mask = 0x7,
+@@ -454,7 +454,7 @@ static int via_init_one(struct pci_dev *
+ 	/* VIA UDMA 66 devices */
+ 	static struct ata_port_info via_udma66_info = {
+ 		.sht = &via_sht,
+-		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
++		.flags = ATA_FLAG_SLAVE_POSS,
+ 		.pio_mask = 0x1f,
+ 		.mwdma_mask = 0x07,
+ 		.udma_mask = 0x1f,
+@@ -463,7 +463,7 @@ static int via_init_one(struct pci_dev *
+ 	/* VIA UDMA 100 devices */
+ 	static struct ata_port_info via_udma100_info = {
+ 		.sht = &via_sht,
+-		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
++		.flags = ATA_FLAG_SLAVE_POSS,
+ 		.pio_mask = 0x1f,
+ 		.mwdma_mask = 0x07,
+ 		.udma_mask = 0x3f,
+@@ -472,7 +472,7 @@ static int via_init_one(struct pci_dev *
+ 	/* UDMA133 with bad AST (All current 133) */
+ 	static struct ata_port_info via_udma133_info = {
+ 		.sht = &via_sht,
+-		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
++		.flags = ATA_FLAG_SLAVE_POSS,
+ 		.pio_mask = 0x1f,
+ 		.mwdma_mask = 0x07,
+ 		.udma_mask = 0x7f,	/* FIXME: should check north bridge */