diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/ata/pata_acpi.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/ata/pata_acpi.c')
| -rw-r--r-- | drivers/ata/pata_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c index c8d47034d5e9..91949d997555 100644 --- a/drivers/ata/pata_acpi.c +++ b/drivers/ata/pata_acpi.c | |||
| @@ -245,7 +245,7 @@ static struct ata_port_operations pacpi_ops = { | |||
| 245 | static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id) | 245 | static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id) |
| 246 | { | 246 | { |
| 247 | static const struct ata_port_info info = { | 247 | static const struct ata_port_info info = { |
| 248 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 248 | .flags = ATA_FLAG_SLAVE_POSS, |
| 249 | 249 | ||
| 250 | .pio_mask = ATA_PIO4, | 250 | .pio_mask = ATA_PIO4, |
| 251 | .mwdma_mask = ATA_MWDMA2, | 251 | .mwdma_mask = ATA_MWDMA2, |