From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 15 May 2006 15:27:47 +0000 (-0400)
Subject: Merge branch 'max-sect' into upstream
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=8d4ee71ff6de5255ebfdf44fb83419d27bd06368;p=deliverable%2Flinux.git

Merge branch 'max-sect' into upstream
---

8d4ee71ff6de5255ebfdf44fb83419d27bd06368
diff --cc include/linux/libata.h
index fcdd798bb086,11d9febc0078..2803ab8e9243
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -108,10 -108,9 +108,11 @@@ enum 
  	LIBATA_MAX_PRD		= ATA_MAX_PRD / 2,
  	ATA_MAX_PORTS		= 8,
  	ATA_DEF_QUEUE		= 1,
 -	ATA_MAX_QUEUE		= 1,
 +	/* tag ATA_MAX_QUEUE - 1 is reserved for internal commands */
 +	ATA_MAX_QUEUE		= 32,
 +	ATA_TAG_INTERNAL	= ATA_MAX_QUEUE - 1,
  	ATA_MAX_SECTORS		= 200,	/* FIXME */
+ 	ATA_MAX_SECTORS_LBA48	= 65535,
  	ATA_MAX_BUS		= 2,
  	ATA_DEF_BUSY_WAIT	= 10000,
  	ATA_SHORT_PAUSE		= (HZ >> 6) + 1,