From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 18 Nov 2005 16:44:17 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f333b3f111e9db76109e304df8ee777ace7fbf86;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'upstream'
---

f333b3f111e9db76109e304df8ee777ace7fbf86
diff --cc drivers/scsi/sata_mv.c
index 088630a890ed,ac184e60797e..9687646d73e1
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@@ -86,17 -84,9 +84,10 @@@ enum 
  	/* Host Flags */
  	MV_FLAG_DUAL_HC		= (1 << 30),  /* two SATA Host Controllers */
  	MV_FLAG_IRQ_COALESCE	= (1 << 29),  /* IRQ coalescing capability */
- 	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,
- 	chip_604x		= 2,
- 	chip_608x		= 3,
+ 	MV_6XXX_FLAGS		= MV_FLAG_IRQ_COALESCE,
  
  	CRQB_FLAG_READ		= (1 << 0),
  	CRQB_TAG_SHIFT		= 1,
diff --cc include/linux/libata.h
index a7cb46ca45e7,83a83babff84..2929282beb40
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -118,8 -119,9 +120,9 @@@ enum 
  	ATA_FLAG_MMIO		= (1 << 6), /* use MMIO, not PIO */
  	ATA_FLAG_SATA_RESET	= (1 << 7), /* use COMRESET */
  	ATA_FLAG_PIO_DMA	= (1 << 8), /* PIO cmds via DMA */
 -	ATA_FLAG_NOINTR		= (1 << 9), /* FIXME: Remove this once
 -					     * proper HSM is in place. */
 +	ATA_FLAG_PIO_POLLING	= (1 << 9), /* use polling PIO if LLD
 +					     * doesn't handle PIO interrupts */
+ 	ATA_FLAG_DEBUGMSG	= (1 << 10),
  
  	ATA_QCFLAG_ACTIVE	= (1 << 1), /* cmd not yet ack'd to scsi lyer */
  	ATA_QCFLAG_SG		= (1 << 3), /* have s/g table? */