From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 9 Oct 2005 13:44:07 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Tag: firefly_0821_release~35456^2~98^2~13^2~97
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f58f8be7f65312f602f7970e7da47a6413e692b0;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream'
---

f58f8be7f65312f602f7970e7da47a6413e692b0
diff --cc drivers/scsi/sata_mv.c
index b8f1f6963179,d457f5673476..e72140342d05
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@@ -71,7 -85,11 +85,12 @@@ enum 
  	/* Host Flags */
  	MV_FLAG_DUAL_HC		= (1 << 30),  /* two SATA Host Controllers */
  	MV_FLAG_IRQ_COALESCE	= (1 << 29),  /* IRQ coalescing capability */
- 	MV_FLAG_BDMA		= (1 << 28),  /* Basic DMA */
+ 	MV_FLAG_GLBL_SFT_RST	= (1 << 28),  /* Global Soft Reset support */
+ 	MV_COMMON_FLAGS		= (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 -				   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO),
++				   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
++				   ATA_FLAG_PIO_POLLING),
+ 	MV_6XXX_FLAGS		= (MV_FLAG_IRQ_COALESCE | 
+ 				   MV_FLAG_GLBL_SFT_RST),
  
  	chip_504x		= 0,
  	chip_508x		= 1,