From 81a825e27bb6da7eea4a0129a6e04e96b4094e80 Mon Sep 17 00:00:00 2001
From: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Date: Fri, 9 Feb 2007 11:29:51 +0800
Subject: [PATCH] --- yaml --- r: 48547 b: refs/heads/master c:
 9f271d576a79f74a543c4099a014d8d4eafa737d h: refs/heads/master i:   48545:
 16261637e80b16800dd179bfcc758e4b589c05c5   48543:
 a64730ddafcc9d7063f5aac3c18822657b9dcee4 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/ia64/Kconfig                 |  1 +
 trunk/include/asm-ia64/libata-portmap.h | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 trunk/include/asm-ia64/libata-portmap.h

diff --git a/[refs] b/[refs]
index dfe4f3c733e1..e6f7dd50ba9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81afe893181b283f9d182ea8637ce6ccdbe1a56a
+refs/heads/master: 9f271d576a79f74a543c4099a014d8d4eafa737d
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index db185f34e341..d51f0f11f7f9 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -22,6 +22,7 @@ config IA64
 
 config 64BIT
 	bool
+	select ATA_NONSTANDARD if ATA
 	default y
 
 config ZONE_DMA
diff --git a/trunk/include/asm-ia64/libata-portmap.h b/trunk/include/asm-ia64/libata-portmap.h
new file mode 100644
index 000000000000..0e00c9a9f410
--- /dev/null
+++ b/trunk/include/asm-ia64/libata-portmap.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_IA64_LIBATA_PORTMAP_H
+#define __ASM_IA64_LIBATA_PORTMAP_H
+
+#define ATA_PRIMARY_CMD		0x1F0
+#define ATA_PRIMARY_CTL		0x3F6
+#define ATA_PRIMARY_IRQ(dev)	isa_irq_to_vector(14)
+
+#define ATA_SECONDARY_CMD	0x170
+#define ATA_SECONDARY_CTL	0x376
+#define ATA_SECONDARY_IRQ(dev)	isa_irq_to_vector(15)
+
+#endif