Merge branch 'upstream-merged'

1 files changed, 37 insertions, 0 deletions

diff --git a/libdde-linux26/contrib/include/linux/ata_platform.h b/libdde-linux26/contrib/include/linux/ata_platform.h
new file mode 100644
index 00000000..9a26c83a
--- /dev/null
+++ b/libdde-linux26/contrib/include/linux/ata_platform.h
@@ -0,0 +1,37 @@
+#ifndef __LINUX_ATA_PLATFORM_H
+#define __LINUX_ATA_PLATFORM_H
+
+struct pata_platform_info {
+	/*
+	 * I/O port shift, for platforms with ports that are
+	 * constantly spaced and need larger than the 1-byte
+	 * spacing used by ata_std_ports().
+	 */
+	unsigned int ioport_shift;
+	/* 
+	 * Indicate platform specific irq types and initial
+	 * IRQ flags when call request_irq()
+	 */
+	unsigned int irq_flags;
+};
+
+extern int __devinit __pata_platform_probe(struct device *dev,
+					   struct resource *io_res,
+					   struct resource *ctl_res,
+					   struct resource *irq_res,
+					   unsigned int ioport_shift,
+					   int __pio_mask);
+
+extern int __devexit __pata_platform_remove(struct device *dev);
+
+/*
+ * Marvell SATA private data
+ */
+struct mbus_dram_target_info;
+
+struct mv_sata_platform_data {
+	struct mbus_dram_target_info	*dram;
+	int	n_ports; /* number of sata ports */
+};
+
+#endif /* __LINUX_ATA_PLATFORM_H */