Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / include / asm-powerpc / libata-portmap.h

diff --git a/include/asm-powerpc/libata-portmap.h b/include/asm-powerpc/libata-portmap.h
index 75484ef..4d85180 100644 (file)
--- a/include/asm-powerpc/libata-portmap.h
+++ b/include/asm-powerpc/libata-portmap.h
@@ -1 +1,12 @@
-#include <asm-generic/libata-portmap.h>
+#ifndef __ASM_POWERPC_LIBATA_PORTMAP_H
+#define __ASM_POWERPC_LIBATA_PORTMAP_H
+
+#define ATA_PRIMARY_CMD        0x1F0
+#define ATA_PRIMARY_CTL        0x3F6
+#define ATA_PRIMARY_IRQ(dev)   pci_get_legacy_ide_irq(dev, 0)
+
+#define ATA_SECONDARY_CMD      0x170
+#define ATA_SECONDARY_CTL      0x376
+#define ATA_SECONDARY_IRQ(dev) pci_get_legacy_ide_irq(dev, 1)
+
+#endif