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/sata_promise.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/sata_promise.c')
| -rw-r--r-- | drivers/ata/sata_promise.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index f03ad48273ff..a004b1e0ea6d 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
| @@ -134,9 +134,7 @@ enum { | |||
| 134 | PDC_IRQ_DISABLE = (1 << 10), | 134 | PDC_IRQ_DISABLE = (1 << 10), |
| 135 | PDC_RESET = (1 << 11), /* HDMA reset */ | 135 | PDC_RESET = (1 << 11), /* HDMA reset */ |
| 136 | 136 | ||
| 137 | PDC_COMMON_FLAGS = ATA_FLAG_NO_LEGACY | | 137 | PDC_COMMON_FLAGS = ATA_FLAG_PIO_POLLING, |
| 138 | ATA_FLAG_MMIO | | ||
| 139 | ATA_FLAG_PIO_POLLING, | ||
| 140 | 138 | ||
| 141 | /* ap->flags bits */ | 139 | /* ap->flags bits */ |
| 142 | PDC_FLAG_GEN_II = (1 << 24), | 140 | PDC_FLAG_GEN_II = (1 << 24), |