diff options
| -rw-r--r-- | drivers/ata/sata_promise.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index 3fdc7cbd9436..825e717bcef9 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | * sata_promise.c - Promise SATA | 2 | * sata_promise.c - Promise SATA |
| 3 | * | 3 | * |
| 4 | * Maintained by: Jeff Garzik <jgarzik@pobox.com> | 4 | * Maintained by: Jeff Garzik <jgarzik@pobox.com> |
| 5 | * Mikael Pettersson <mikpe@it.uu.se> | ||
| 5 | * Please ALWAYS copy linux-ide@vger.kernel.org | 6 | * Please ALWAYS copy linux-ide@vger.kernel.org |
| 6 | * on emails. | 7 | * on emails. |
| 7 | * | 8 | * |
| @@ -45,7 +46,7 @@ | |||
| 45 | #include "sata_promise.h" | 46 | #include "sata_promise.h" |
| 46 | 47 | ||
| 47 | #define DRV_NAME "sata_promise" | 48 | #define DRV_NAME "sata_promise" |
| 48 | #define DRV_VERSION "2.10" | 49 | #define DRV_VERSION "2.11" |
| 49 | 50 | ||
| 50 | enum { | 51 | enum { |
| 51 | PDC_MAX_PORTS = 4, | 52 | PDC_MAX_PORTS = 4, |
| @@ -241,7 +242,7 @@ static const struct ata_port_operations pdc_pata_ops = { | |||
| 241 | }; | 242 | }; |
| 242 | 243 | ||
| 243 | static const struct ata_port_info pdc_port_info[] = { | 244 | static const struct ata_port_info pdc_port_info[] = { |
| 244 | /* board_2037x */ | 245 | [board_2037x] = |
| 245 | { | 246 | { |
| 246 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | | 247 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | |
| 247 | PDC_FLAG_SATA_PATA, | 248 | PDC_FLAG_SATA_PATA, |
| @@ -251,7 +252,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
| 251 | .port_ops = &pdc_old_sata_ops, | 252 | .port_ops = &pdc_old_sata_ops, |
| 252 | }, | 253 | }, |
| 253 | 254 | ||
| 254 | /* board_2037x_pata */ | 255 | [board_2037x_pata] = |
| 255 | { | 256 | { |
| 256 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS, | 257 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS, |
| 257 | .pio_mask = 0x1f, /* pio0-4 */ | 258 | .pio_mask = 0x1f, /* pio0-4 */ |
| @@ -260,7 +261,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
| 260 | .port_ops = &pdc_pata_ops, | 261 | .port_ops = &pdc_pata_ops, |
| 261 | }, | 262 | }, |
| 262 | 263 | ||
| 263 | /* board_20319 */ | 264 | [board_20319] = |
| 264 | { | 265 | { |
| 265 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | | 266 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | |
| 266 | PDC_FLAG_4_PORTS, | 267 | PDC_FLAG_4_PORTS, |
| @@ -270,7 +271,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
| 270 | .port_ops = &pdc_old_sata_ops, | 271 | .port_ops = &pdc_old_sata_ops, |
| 271 | }, | 272 | }, |
| 272 | 273 | ||
| 273 | /* board_20619 */ | 274 | [board_20619] = |
| 274 | { | 275 | { |
| 275 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS | | 276 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS | |
| 276 | PDC_FLAG_4_PORTS, | 277 | PDC_FLAG_4_PORTS, |
| @@ -280,7 +281,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
| 280 | .port_ops = &pdc_pata_ops, | 281 | .port_ops = &pdc_pata_ops, |
| 281 | }, | 282 | }, |
| 282 | 283 | ||
| 283 | /* board_2057x */ | 284 | [board_2057x] = |
| 284 | { | 285 | { |
| 285 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | | 286 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | |
| 286 | PDC_FLAG_GEN_II | PDC_FLAG_SATA_PATA, | 287 | PDC_FLAG_GEN_II | PDC_FLAG_SATA_PATA, |
| @@ -290,7 +291,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
| 290 | .port_ops = &pdc_sata_ops, | 291 | .port_ops = &pdc_sata_ops, |
| 291 | }, | 292 | }, |
| 292 | 293 | ||
| 293 | /* board_2057x_pata */ | 294 | [board_2057x_pata] = |
| 294 | { | 295 | { |
| 295 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS | | 296 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS | |
| 296 | PDC_FLAG_GEN_II, | 297 | PDC_FLAG_GEN_II, |
| @@ -300,7 +301,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
| 300 | .port_ops = &pdc_pata_ops, | 301 | .port_ops = &pdc_pata_ops, |
| 301 | }, | 302 | }, |
| 302 | 303 | ||
| 303 | /* board_40518 */ | 304 | [board_40518] = |
| 304 | { | 305 | { |
| 305 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | | 306 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | |
| 306 | PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS, | 307 | PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS, |
