From: Andrew Morton <akpm@osdl.org>

Fix up reject between git-libata-all and current -linus.

Hope this is right: ATA_TFLAG_POLLING was previously 1<<5, but ATA_TFLAG_FUA
took that.

Cc: Tejun Heo <htejun@gmail.com>
Cc: Jens Axboe <axboe@suse.de>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/ata.h |    1 +
 1 files changed, 1 insertion(+)

diff -puN include/linux/ata.h~git-libata-all-fixup include/linux/ata.h
--- devel/include/linux/ata.h~git-libata-all-fixup	2006-01-06 14:42:00.000000000 -0800
+++ devel-akpm/include/linux/ata.h	2006-01-06 14:42:12.000000000 -0800
@@ -197,6 +197,7 @@ enum {
 	ATA_TFLAG_WRITE		= (1 << 3), /* data dir: host->dev==1 (write) */
 	ATA_TFLAG_LBA		= (1 << 4), /* enable LBA */
 	ATA_TFLAG_FUA		= (1 << 5), /* enable FUA */
+	ATA_TFLAG_POLLING	= (1 << 6), /* set nIEN to 1 and use polling */
 };
 
 enum ata_tf_protocols {
_