Merge branch 'master'

This commit is contained in:
Jeff Garzik
2005-11-11 23:39:35 -05:00
1391 changed files with 70467 additions and 35290 deletions

View File

@@ -29,6 +29,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <linux/ata.h>
#include <linux/workqueue.h>
@@ -399,12 +400,13 @@ struct ata_port_operations {
};
struct ata_port_info {
struct scsi_host_template *sht;
struct scsi_host_template *sht;
unsigned long host_flags;
unsigned long pio_mask;
unsigned long mwdma_mask;
unsigned long udma_mask;
const struct ata_port_operations *port_ops;
void *private_data;
};
struct ata_timing {