rpms/kernel/FC-4 kernel-2.6.spec, 1.1565, 1.1566 linux-2.6-sata-promise-pata-ports.patch, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31140

Modified Files:
	kernel-2.6.spec linux-2.6-sata-promise-pata-ports.patch 
Log Message:
Enable PATA ports on Promise.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1565
retrieving revision 1.1566
diff -u -r1.1565 -r1.1566
--- kernel-2.6.spec	6 Jan 2006 06:09:05 -0000	1.1565
+++ kernel-2.6.spec	6 Jan 2006 06:13:52 -0000	1.1566
@@ -342,6 +342,7 @@
 Patch1740: linux-2.6-block-reduce-stack.patch
 Patch1750: linux-2.6-ub.patch
 Patch1760: linux-2.6-sata-enable-atapi-by-default.patch
+Patch1761: linux-2.6-sata-promise-pata-ports.patch
 Patch1770: linux-2.6-valid-ether-addr.patch
 Patch1780: linux-2.6-firmware-loader-timeout.patch
 Patch1790: linux-2.6-x86-hp-reboot.patch
@@ -768,6 +769,8 @@
 %patch1750 -p1
 # Enable SATA ATAPI by default.
 %patch1760 -p1
+# Enable PATA ports on Promise.
+%patch1761 -p1
 # 
 %patch1770 -p1
 # Increase timeout on firmware loader.

linux-2.6-sata-promise-pata-ports.patch:
 drivers/scsi/ata_piix.c     |   40 +++++----------------------------
 drivers/scsi/libata-core.c  |   21 ++++++++++++++---
 drivers/scsi/sata_promise.c |   52 ++++++++++++++++++++++++++++++++++++++------
 include/linux/libata.h      |    3 --
 4 files changed, 70 insertions(+), 46 deletions(-)

Index: linux-2.6-sata-promise-pata-ports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-sata-promise-pata-ports.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-sata-promise-pata-ports.patch	13 Dec 2005 02:26:22 -0000	1.4
+++ linux-2.6-sata-promise-pata-ports.patch	6 Jan 2006 06:13:52 -0000	1.5
@@ -115,15 +115,15 @@
  static void pdc_pata_phy_reset(struct ata_port *ap);
  static void pdc_sata_phy_reset(struct ata_port *ap);
  static void pdc_qc_prep(struct ata_queued_cmd *qc);
-@@ -162,7 +163,7 @@ static struct ata_port_info pdc_port_inf
+@@ -165,7 +165,7 @@ static struct ata_port_info pdc_port_inf
  	/* board_2037x */
  	{
  		.sht		= &pdc_ata_sht,
--		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-+		.host_flags	= /* ATA_FLAG_SATA | */ ATA_FLAG_NO_LEGACY |
- 				  ATA_FLAG_SRST | ATA_FLAG_MMIO,
+-		.host_flags	= PDC_COMMON_FLAGS | ATA_FLAG_SATA,
++		.host_flags	= PDC_COMMON_FLAGS,
  		.pio_mask	= 0x1f, /* pio0-4 */
  		.mwdma_mask	= 0x07, /* mwdma0-2 */
+ 		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
 @@ -311,17 +312,34 @@ static void pdc_reset_port(struct ata_po
  static void pdc_sata_phy_reset(struct ata_port *ap)
  {