From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 9 Oct 2005 15:16:14 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.15-rc1~736
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4052da6f0c01a0b059d125d72bb934d0980b798;p=linux-2.6

Merge branch 'upstream'
---

c4052da6f0c01a0b059d125d72bb934d0980b798
diff --cc include/linux/libata.h
index 3ab67622ef,7929cfc931..0f89f4121f
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -154,21 -155,21 +155,25 @@@ enum 
  	ATA_SHIFT_UDMA		= 0,
  	ATA_SHIFT_MWDMA		= 8,
  	ATA_SHIFT_PIO		= 11,
 +
 +	/* size of buffer to pad xfers ending on unaligned boundaries */
 +	ATA_DMA_PAD_SZ		= 4,
 +	ATA_DMA_PAD_BUF_SZ	= ATA_DMA_PAD_SZ * ATA_MAX_QUEUE,
+ 	
+ 	/* Masks for port functions */
+ 	ATA_PORT_PRIMARY	= (1 << 0),
+ 	ATA_PORT_SECONDARY	= (1 << 1),
  };
  
- enum pio_task_states {
- 	PIO_ST_UNKNOWN,
- 	PIO_ST_IDLE,
- 	PIO_ST_POLL,
- 	PIO_ST_TMOUT,
- 	PIO_ST,
- 	PIO_ST_LAST,
- 	PIO_ST_LAST_POLL,
- 	PIO_ST_ERR,
+ enum hsm_task_states {
+ 	HSM_ST_UNKNOWN,
+ 	HSM_ST_IDLE,
+ 	HSM_ST_POLL,
+ 	HSM_ST_TMOUT,
+ 	HSM_ST,
+ 	HSM_ST_LAST,
+ 	HSM_ST_LAST_POLL,
+ 	HSM_ST_ERR,
  };
  
  /* forward declarations */