diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /drivers/ide/pci/pdc202xx_old.c | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/ide/pci/pdc202xx_old.c')
| -rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 6f8f8645b02c..7ce5bf783688 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
| @@ -798,7 +798,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { | |||
| 798 | .autodma = AUTODMA, | 798 | .autodma = AUTODMA, |
| 799 | .bootable = OFF_BOARD, | 799 | .bootable = OFF_BOARD, |
| 800 | .extra = 48, | 800 | .extra = 48, |
| 801 | .flags = IDEPCI_FLAG_FORCE_PDC, | ||
| 802 | },{ /* 2 */ | 801 | },{ /* 2 */ |
| 803 | .name = "PDC20263", | 802 | .name = "PDC20263", |
| 804 | .init_setup = init_setup_pdc202ata4, | 803 | .init_setup = init_setup_pdc202ata4, |
| @@ -819,7 +818,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { | |||
| 819 | .autodma = AUTODMA, | 818 | .autodma = AUTODMA, |
| 820 | .bootable = OFF_BOARD, | 819 | .bootable = OFF_BOARD, |
| 821 | .extra = 48, | 820 | .extra = 48, |
| 822 | .flags = IDEPCI_FLAG_FORCE_PDC, | ||
| 823 | },{ /* 4 */ | 821 | },{ /* 4 */ |
| 824 | .name = "PDC20267", | 822 | .name = "PDC20267", |
| 825 | .init_setup = init_setup_pdc202xx, | 823 | .init_setup = init_setup_pdc202xx, |