7/8 Backport recent 2.6 IDE updates to 2.4.x

This patch changes the IDE driver to use "capacity64" (describing the size of the variable) rather than "capacity48" (which describes that 48 bit addressing is in use). We really do not care, in this context, what addressing happens to be in use. This patch then eliminates the artifical distinction between the old "capacity" and "capacity48" variables.

-Erik

--
Erik B. Andersen http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--

@@ -785,8 +785,7 @@
 	unsigned int	failures;	/* current failure count */
 	unsigned int	max_failures;	/* maximum allowed failure count */
 
-	u32		capacity;	/* total number of sectors */
-	u64		capacity48;	/* total number of sectors */
+	u64		capacity64;	/* total number of sectors */
 
 	int		last_lun;	/* last logical unit */
 	int		forced_lun;	/* if hdxlun was given at boot */