From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 13 Dec 2005 07:32:01 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e8b09428482deff1a9d7a36d371acee364182ec3;p=linux-beck.git

Merge branch 'upstream'
---

e8b09428482deff1a9d7a36d371acee364182ec3
diff --cc include/linux/libata.h
index b77f156e5768,e828e172ccbf..596858e37cc1
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -120,9 -119,10 +120,10 @@@ 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_FLAG_NO_ATAPI	= (1 << 11), /* No ATAPI support */
  
  	ATA_QCFLAG_ACTIVE	= (1 << 1), /* cmd not yet ack'd to scsi lyer */
  	ATA_QCFLAG_SG		= (1 << 3), /* have s/g table? */